When trying to recreate some of the issues I'm posting now, I discovered that svn merge segfaults in these two quite simple cases.
Peter
rm -rf repo wc tmpfile
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
# This fails with a conflict as intended in txt for
# bug # 1319: "conflict with merge that adds binary files"
# svn import -m "" /bin/ls file://`pwd`/repo/zig/zag/zog
# However, either of these two cause a Segmentation fault in 0.26.0
# during svn merge below
# svn import -m "" file://`pwd`/repo/zig/zag /bin/ls zog
svn import -m "" /bin/ls file://`pwd`/repo/zig/zog
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
--------------------------------------
Protect yourself from spam,
use http://sneakemail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 29 16:26:02 2003