[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug in reverse-merging across a rename?

From: Jim Paris <jim_at_jtan.com>
Date: Fri, 16 Mar 2012 17:37:45 -0400

If I try to reverse-merge the contents of a specific file over a range
of commits that includes a rename, svn seems to break the commits up
at the rename and try to reverse-merge in the wrong order.

svn merge --accept=postpone -r5:1 new
--- Reverse-merging r3 through r2 into 'new':
C new
--- Reverse-merging r5 through r4 into 'new':
C new
Summary of conflicts:
  Text conflicts: 2

There would have been no conflicts if it did "r5 through r4" first,
then "r3 through r2" second.

Attached is a script that demonstrates the issue, as well as the
output of the script on my machine. The last command in the script is
the one that has the unexpected conflicts.


  • application/x-sh attachment: test.sh
Received on 2012-03-16 23:17:08 CET

This is an archived mail posted to the Subversion Dev mailing list.