You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joshua Varner <jl...@gmail.com> on 2005/09/01 14:54:23 UTC
Re: [BUG] maybe - svn backwards merge with binary file
Ping - Should I file this in the issue tracker before I forget that I sent
it?
Josh
P.S. Please excuse the top posting
On 8/26/05, Joshua Varner <jl...@gmail.com> wrote:
>
> I was trying to reproduce a bug that was reported a bit ago:
> http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=35170
>
> I couldn't reproduce this problem, until I accidentally tried to do an
> 'svn merge TRUNK BRANCH' while in a branch working copy.
> This gave the behavior described, i.e. the merge issues no errors
> but I have the diff conflict files, and subsequent commands
> report that I have an unresolved issue.
>
> Now, this seems to be a bug, but I can only reproduce it by
> intentionally screwing up so I don't know how important this
> is, or if it should just be considered user error. If I should add
> this to the Issue Tracker let me know.
>
> Below is a transcript and I attached a script to reproduce.
> Josh
>
> [josh@lcc51 sandbox]$ rm -rf *; ../bug-recipe
> + svnadmin create test-repos
> ++ cd test-repos/
> ++ pwd
> + export REPO=/work/test/svn/sandbox/test-repos
> + REPO=/work/test/svn/sandbox/test-repos
> + mkdir test-import test-import/trunk test-import/branches
> + echo A file
> + cd test-import/
> + svn import file:////work/test/svn/sandbox/test-repos -m 'Initial import'
> Adding trunk
> Adding trunk/file
> Adding branches
>
> Committed revision 1.
> + svn cp file:////work/test/svn/sandbox/test-repos/trunk
> file:////work/test/svn/sandbox/test-repos/branches/br1 -m Branching
>
> Committed revision 2.
> + svn co file:////work/test/svn/sandbox/test-repos/branches/br1 test-wc
> A test-wc/file
> Checked out revision 2.
> + cd test-wc
> + echo New File
> + svn add file2
> A file2
> + svn propset svn:mime-type image/jpg file2
> property 'svn:mime-type' set on 'file2'
> + svn merge file:////work/test/svn/sandbox/test-repos/trunk
> file:////work/test/svn/sandbox/test-repos/branches/br1
> + svn commit -m 'Added file'
> Adding (bin) file2
> Transmitting file data .
> Committed revision 3.
> + svn merge file:////work/test/svn/sandbox/test-repos/trunk
> file:////work/test/svn/sandbox/test-repos/branches/br1
> A file2
> + ls -l
> total 12
> -rw-rw-r-- 1 josh josh 7 Aug 26 14:19 file
> -rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2
> -rw-rw-r-- 1 josh josh 0 Aug 26 14:19 file2.merge-left.r0
> -rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2.merge-right.r3
> + svn status
> ? file2.merge-left.r0
> ? file2.merge-right.r3
> C file2
>
>
>
Re: [BUG] maybe - svn backwards merge with binary file
Posted by Joshua Varner <jl...@gmail.com>.
On 9/13/05, Daniel Rall <dl...@finemaltcoding.com> wrote:
> Yes please.
>
Done, Issue 2403.
http://subversion.tigris.org/issues/show_bug.cgi?id=2403
Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [BUG] maybe - svn backwards merge with binary file
Posted by Daniel Rall <dl...@finemaltcoding.com>.
Yes please.
On Thu, 01 Sep 2005, Joshua Varner wrote:
> Ping - Should I file this in the issue tracker before I forget that I sent
> it?
>
> Josh
>
> P.S. Please excuse the top posting
>
> On 8/26/05, Joshua Varner <jl...@gmail.com> wrote:
> >
> > I was trying to reproduce a bug that was reported a bit ago:
> > http://subversion.tigris.org/servlets/ReadMsg?list=users&msgNo=35170
> >
> > I couldn't reproduce this problem, until I accidentally tried to do an
> > 'svn merge TRUNK BRANCH' while in a branch working copy.
> > This gave the behavior described, i.e. the merge issues no errors
> > but I have the diff conflict files, and subsequent commands
> > report that I have an unresolved issue.
> >
> > Now, this seems to be a bug, but I can only reproduce it by
> > intentionally screwing up so I don't know how important this
> > is, or if it should just be considered user error. If I should add
> > this to the Issue Tracker let me know.
> >
> > Below is a transcript and I attached a script to reproduce.
> > Josh
> >
> > [josh@lcc51 sandbox]$ rm -rf *; ../bug-recipe
> > + svnadmin create test-repos
> > ++ cd test-repos/
> > ++ pwd
> > + export REPO=/work/test/svn/sandbox/test-repos
> > + REPO=/work/test/svn/sandbox/test-repos
> > + mkdir test-import test-import/trunk test-import/branches
> > + echo A file
> > + cd test-import/
> > + svn import file:////work/test/svn/sandbox/test-repos -m 'Initial import'
> > Adding trunk
> > Adding trunk/file
> > Adding branches
> >
> > Committed revision 1.
> > + svn cp file:////work/test/svn/sandbox/test-repos/trunk
> > file:////work/test/svn/sandbox/test-repos/branches/br1 -m Branching
> >
> > Committed revision 2.
> > + svn co file:////work/test/svn/sandbox/test-repos/branches/br1 test-wc
> > A test-wc/file
> > Checked out revision 2.
> > + cd test-wc
> > + echo New File
> > + svn add file2
> > A file2
> > + svn propset svn:mime-type image/jpg file2
> > property 'svn:mime-type' set on 'file2'
> > + svn merge file:////work/test/svn/sandbox/test-repos/trunk
> > file:////work/test/svn/sandbox/test-repos/branches/br1
> > + svn commit -m 'Added file'
> > Adding (bin) file2
> > Transmitting file data .
> > Committed revision 3.
> > + svn merge file:////work/test/svn/sandbox/test-repos/trunk
> > file:////work/test/svn/sandbox/test-repos/branches/br1
> > A file2
> > + ls -l
> > total 12
> > -rw-rw-r-- 1 josh josh 7 Aug 26 14:19 file
> > -rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2
> > -rw-rw-r-- 1 josh josh 0 Aug 26 14:19 file2.merge-left.r0
> > -rw-rw-r-- 1 josh josh 9 Aug 26 14:19 file2.merge-right.r3
> > + svn status
> > ? file2.merge-left.r0
> > ? file2.merge-right.r3
> > C file2
> >
> >
> >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org