Re: Strange conflicts during merge

On Tue, May 20, 2003 at 03:21:29PM +0100, Philip Martin wrote:
[snip]
> 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

Modifying the above recipe slightly... If you add a text file, and
manually set the svn:mime-type prop to something that is not recognised
as text, it also fails:

rm -rf repo wc
svnadmin create repo
svn mkdir -m "" file://`pwd`/repo/zig
svn mkdir -m "" file://`pwd`/repo/zig/zag
svn mkdir -m "" file://`pwd`/repo/foo
svn co file://`pwd`/repo/zig/zag wc
cp /etc/shells wc
svn add wc/shells
svn ps svn:mime-type something/something wc/shells
svn ci -m "" wc
rm -rf wc
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
svn st wc

Setting other props instead of svn:mime-type or setting svn:mime-type to
text/plain work fine.

-- 
Michael Wood <mwood@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org