I get a segmentation fault with "merge --dry-run", if
the svn:keyword property changed, and the target is wrong.
$ svnadmin create repos
$ svn co file:///var/lib/svn/repos/ wc
Checked out revision 0.
$ cd wc
$ svn mkdir trunk
A trunk
$ echo "1" > trunk/file.txt
$ svn add trunk/file.txt
A trunk/file.txt
$ svn ps svn:keywords 'id' trunk/file.txt
property 'svn:keywords' set on 'trunk/file.txt'
$ svn ci -m ''
Adding trunk
Adding trunk/file.txt
Transmitting file data .
Committed revision 1.
$ svn pd svn:keywords trunk/file.txt
property 'svn:keywords' deleted from 'trunk/file.txt'.
$ svn mkdir branches
A branches
$ svn ci -m ''
Adding branches
Sending trunk/file.txt
Committed revision 2.
$ cd branches/
$ svn merge --dry-run -r1:2 .. .
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 18 16:08:34 2005