bug in "Undoing Changes" functionality of merge -c -N?
From: Nairn Baliber <planetkiller_at_gmail.com>
Date: Fri, 29 Jun 2012 13:33:31 -0700
I am running Subversion version 1.6.4 on a rhel5 system. Unfortunately, I
The bug question I have is also posted at the following link, if it's
I was checking out Subversion functionality by attempting to recreate the
As I read it, that subsection claims that changes committed in the past can
svn merge -c -rN file:///path_to_repos/trunk
where rN is the resulting revision number of the commit that contained
In order to follow the example, in my working copy directory, I edited a
---- this is my first import to trunk. r1. this is my first commit, first edit of testcode.py. r2. this is another edit of testcode.py. r3. this is an edit of testcode.py. i'll get rid of this one. r4. this is another edit of testcode.py. keeping it. r5. yet another edit. keeping it. r6. ----- The revision numbers in the repository match up to the lines in the file such that in /trunk/testcode.py_at_rN, the last line of the file is the one ending with rN. What I want to do is remove the line ending in r4, keeping everything else before and after unchanged. Following the example in the Undoing Changes section of the svnbook, I run the command svn merge -c -4 file:///path_to_repos/trunk This creates a conflict (upon running that command, not on commit), whereby the merge-left file contains everything up until line r4, and the merge-right file contains everything up until line r3. In other words, instead of removing a past change, the command seems to want to revert the entire file back to either revision 3 or 4, removing changes in subsequent revisions (5 and 6, in this case). This appears not to be the way the merge command should behave, in this case seeing as the Undoing Changes section of the svnbook has the hypothetical user removing a commit from revision 303 with no conflict in the merge -c command, and committing to revision 350. If that example holds, the command I ran should have produced a file with the line ending in r4 removed and everything else unchanged. This appears to be a bug, but if not, I'd appreciate some advice as to what I'm doing incorrectly. Thanks. NairnReceived on 2012-06-29 22:36:05 CEST
This is an archived mail posted to the Subversion Users mailing list.