Re: Subversion merge creates bogus tree conflicts

On Tue, Jan 15, 2013 at 11:16 AM, Ben Reser <ben_at_reser.org> wrote:
> Here's the same as above just as a script to demonstrate:
> [[[
> svn mkdir --parents $REPOS/test1/branches/B1/A -m xx
> svn co $REPOS/test1/branches/B1
> echo test > B1/A/test.txt
> svn add B1/A/test.txt
> svn commit -m xx B1
> svn cp $REPOS/test1/branches/B1 $REPOS/test1/branches/B2 -m xx
> svn co $REPOS/test1/branches/B2
> echo test2 >> B2/A/test.txt
> svn commit B2 -m xx
> svn co $REPOS/test1/branches/B1
> cd B1
> svn rm --force A
> svn commit -m xx
> svn merge -r0:HEAD $REPOS/test1/branches/B2
> ]]]

and that last merge really can be just:
svn merge $REPOS/test1/branches/B2

But that's what I get for copying and pasting too much.
Received on 2013-01-15 20:21:45 CET