Re: Strange conflicts during merge

Ben Collins-Sussman <sussman@collab.net> writes:

> > svn status
> > C + webserver/ppp/Admin/img/b_addimage.gif
> > ? webserver/ppp/Admin/img/b_addimage.gif.older
> > ? webserver/ppp/Admin/img/b_addimage.gif.yours
> > C + webserver/ppp/Admin/img/b_archive.gif
> > ? webserver/ppp/Admin/img/b_archive.gif.older
> > ? webserver/ppp/Admin/img/b_archive.gif.yours
> > [...]
>
> Interesting that these are "C +", and that they seem to binary files.

Indeed, it's a bug with merges that add binary files. The problem
above can be reproduced

rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/zig/zag
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig/zag /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc

and

rm -rf repo wc
svnadmin create repo
svn mkdir file://`pwd`/repo/zig
svn mkdir file://`pwd`/repo/foo
svn import file://`pwd`/repo/zig /bin/ls zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc

gives a property merge confict.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org