Hello,
Please find reproduction script for the bug attached. It does work with
Subversion 1.5.0 (displays merge history) and doesn't work with
Subversion 1.5.1 and 1.5.x (r32765).
--
Alexander Kitaev,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!
#!/bin/sh
# The next line is the only line you should need to adjust.
SVNDIR=/home/builder/usr/svn-15x/bin/
SVN=${SVNDIR}/svn
SVNSERVE=${SVNDIR}/svnserve
SVNADMIN=${SVNDIR}/svnadmin
URL=file:///`pwd`/repos
rm -rf repos trunk-wc branch-wc
${SVNADMIN} create repos
${SVN} mkdir ${URL}/trunk ${URL}/branches -m "structure"
${SVN} co ${URL}/trunk trunk-wc
echo "This is the file 'file.txt'." > trunk-wc/file.txt
${SVN} add trunk-wc/file.txt
${SVN} ci trunk-wc -m "file added"
${SVN} up trunk-wc
${SVN} cp trunk-wc ${URL}/branches/branch -m "branch created"
${SVN} co ${URL}/branches/branch branch-wc
echo "Modified in branch." >> branch-wc/file.txt
${SVN} ci branch-wc -m "file modified in branch"
${SVN} cp trunk-wc/file.txt trunk-wc/file_copy.txt
${SVN} ci trunk-wc -m "file copied"
${SVN} up trunk-wc
${SVN} merge -r3:4 ${URL}/branches/branch trunk-wc
${SVN} merge -r3:4 ${URL}/branches/branch/file.txt trunk-wc/file_copy.txt
echo "###"
echo "### merge info set after double merge:"
echo "###"
${SVN} pl -vR trunk-wc
${SVN} ci trunk-wc -m "double merge"
${SVN} up trunk-wc
echo "###"
echo "### log -g output should include merge history, but it does not."
echo "###"
${SVN} log -gv -rHEAD trunk-wc
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-27 19:47:41 CEST