Re: Bug: merge --dry-run with wrong target

Martin von Oertzen <maletin@mail.berlios.de> writes:
> I still get this Segmentation Fault with the new svn-version.
> svn, version 1.1.4 (r13838) compiled Apr 10 2005, 01:31:37
> svnadmin, version 1.1.4 (r13838) compiled Apr 10 2005, 01:31:37

Thanks for reporting. I thought this might be the same bug as

   http://subversion.tigris.org/issues/show_bug.cgi?id=2254

But using the following shell script, I can't reproduce your bug.
This is based on the recipe you posted, please take a look and tell me
if I'm missing anything important:

#!/bin/sh

SVN=${HOME}/src/subversion/subversion/clients/cmdline/svn
SVNADMIN=${HOME}/src/subversion/subversion/svnadmin/svnadmin

URL=file:///`pwd`/repos

rm -rf repos wc

${SVNADMIN} create repos
${SVN} co ${URL}/ wc

cd wc

${SVN} mkdir trunk
echo "1" > trunk/file.txt
${SVN} add trunk/file.txt
${SVN} ps svn:keywords 'id' trunk/file.txt
${SVN} ci -m ''
${SVN} pd svn:keywords trunk/file.txt
${SVN} mkdir branches
${SVN} ci -m ''

cd branches/

echo ""
echo "In directory wc/branches, about to run 'svn merge --dry-run -r1:2 .. .':"
echo ""

${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 Tue Apr 12 17:45:06 2005