Hi, i've noticed that a new subversion-1.7.2 can't reintegrate a trivial branch.
attached script produces on svn-1.5.2 following correct results: $ ./merge-test.sh + export LANG=C + pwd + readlink -m /home/users/pluto + here=/home/users/pluto + rm -rf repo.svn repo.svn.wc repo.git + svnadmin create repo.svn + svn co file:///home/users/pluto/repo.svn repo.svn.wc Checked out revision 0. + cd repo.svn.wc + mkdir -p trunk branches tags + svn add branches tags trunk A branches A tags A trunk + svn ci -m std layout Adding branches Adding tags Adding trunk Committed revision 1. + cd trunk + echo foo + > file.txt + svn add file.txt A file.txt + svn ci file.txt -m foo Adding file.txt Transmitting file data . Committed revision 2. + cd .. + svn cp trunk branches/feature-bar A branches/feature-bar + svn ci branches -m bar feature branch Adding branches/feature-bar Adding branches/feature-bar/file.txt Committed revision 3. + svn up At revision 3. + cd trunk + svn merge --reintegrate file:///home/users/pluto/repo.svn/branches/feature-bar . --- Merging differences between repository URLs into '.': A file.txt U . + svn ci -m merge feature bar Sending trunk Committed revision 4. + cd .. but on svn-1.7.2 it fails: $ ./merge-test.sh + export LANG=C + pwd + readlink -m /home/users/pluto/src/git-svn-test + here=/home/users/pluto/src/git-svn-test + rm -rf repo.svn repo.svn.wc repo.git + svnadmin create repo.svn + svn co file:///home/users/pluto/src/git-svn-test/repo.svn repo.svn.wc Checked out revision 0. + cd repo.svn.wc + mkdir -p trunk branches tags + svn add branches tags trunk A branches A tags A trunk + svn ci -m std layout Adding branches Adding tags Adding trunk Committed revision 1. + cd trunk + echo foo + >file.txt + svn add file.txt A file.txt + svn ci file.txt -m foo Adding file.txt Transmitting file data . Committed revision 2. + cd .. + svn cp trunk branches/feature-bar A branches/feature-bar + svn ci branches -m bar feature branch Adding branches/feature-bar Adding branches/feature-bar/file.txt Committed revision 3. + svn up Updating '.': At revision 3. + cd trunk + svn merge --reintegrate file:///home/users/pluto/src/git-svn-test/repo.svn/branches/feature-bar . --- Merging differences between repository URLs into '.': C file.txt --- Recording mergeinfo for merge between repository URLs into '.': U . Summary of conflicts: Tree conflicts: 1 + svn ci -m merge feature bar svn: E155015: Commit failed (details follow): svn: E155015: Aborting commit: '/home/users/pluto/src/git-svn-test/repo.svn.wc/trunk/file.txt' remains in conflict + cd .. BR, Paweł. please CC me on reply.
merge-test.sh
Description: application/shellscript
