Bug#507764: svn merge reverts previous merges

[Ben Hutchings] > It turned out to be fairly easy to backport the upstream changes. > Here's the patch: Thanks for tracking this down and backporting it, Ben. I hope I'll have time to make an upload in a couple of days. (Like much of the world, I'm out of town today and tomorrow.) > A couple o

Bug#507764: svn merge reverts previous merges

It turned out to be fairly easy to backport the upstream changes. Here's the patch: --- subversion-1.5.1dfsg1.orig/subversion/tests/cmdline/merge_tests.py +++ subversion-1.5.1dfsg1/subversion/tests/cmdline/merge_tests.py @@ -12523,6 +12523,220 @@ svntest.actions.run_and_verify_svn(None, ["At re

Bug#507764: svn merge reverts previous merges

The bug initially described at and in the upstream tracker at involves failed merges, not silent incorrect merges. I assume this actually refers to the other changes mentioned on the

Bug#507764: svn merge reverts previous merges

Package: subversion Version: 1.5.1dfsg1-1 Severity: grave Justification: causes data loss (hoses up respositories/working copies?) Hi, See http://www.openoffice.org/issues/show_bug.cgi?id=96877. svn merge done the first time: OK svn merge done the second time: reverts the first As said, this is