SVN 1.5.1 does not handle a merge scenario (reports a conflict) where a
new file is added to trunk, then merged to a branch, then modified in
the branch and then merged back to trunk.
The merge back to trunk fails with a conflict when using svn merge with
no additional options.
With the-reintegrate option the correct merge/update occurs instead.
Please find the console log below. My expectation was that merge should
handle this case w/o additional options. It looks like a bug. Even if
there was no common ancestor or merge info, the change itself is not a
conflict, just comparing the two files should be sufficient to merge.
Thanks,
Thomas
svn copy http://hiva.pao.efrontier.com/svn/sandbox/trunk
http://hiva.pao.efrontier.com/svn/sandbox/branches/branch1
svn co http://hiva.pao.efrontier.com/svn/sandbox/trunk .
tweise_at_hiva:~/svn/hiva/sandbox> echo xxx > file1.txt
tweise_at_hiva:~/svn/hiva/sandbox> svn add file1.txt
A file1.txt
tweise_at_hiva:~/svn/hiva/sandbox> svn commit -m "adding file1 to main"
Adding file1.txt
Transmitting file data .
Committed revision 4.
tweise_at_hiva:~/svn/hiva/sandbox> svn switch
http://hiva.pao.efrontier.com/svn/sandbox/branches/branch1
D file1.txt
Updated to revision 4.
tweise_at_hiva:~/svn/hiva/sandbox> svn merge
http://hiva.pao.efrontier.com/svn/sandbox/trunk
--- Merging r3 through r4 into '.':
A file1.txt
tweise_at_hiva:~/svn/hiva/sandbox> svn commit -m "merge from trunk"
Sending .
Adding file1.txt
Committed revision 5.
tweise_at_hiva:~/svn/hiva/sandbox> vi file1.txt
tweise_at_hiva:~/svn/hiva/sandbox> svn commit -m "changing file1 in
branch1"
Sending file1.txt
Transmitting file data .
Committed revision 6.
tweise_at_hiva:~/svn/hiva/sandbox> svn switch
http://hiva.pao.efrontier.com/svn/sandbox/trunk
U file1.txt
U .
tweise_at_hiva:~/svn/hiva/sandbox> svn merge
http://hiva.pao.efrontier.com/svn/sandbox/branches/branch1
Conflict discovered in 'file1.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: df
--- .svn/tmp/tempfile.tmp Tue Aug 26 11:32:18 2008
+++ .svn/tmp/tempfile.3.tmp Tue Aug 26 11:32:18 2008
@@ -0,0 +1,9 @@
+<<<<<<< .working
+xxx
+=======
+xxx
+yyy
+zzz
+
+
+>>>>>>> .merge-right.r6
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(h) help for more options:
svn revert . -R
svn cleanup
svn up
tweise_at_hiva:~/svn/hiva/sandbox> svn merge --reintegrate
http://hiva.pao.efrontier.com/svn/sandbox/branches/branch1
--- Merging differences between repository URLs into '.':
U file1.txt
U .
tweise_at_hiva:~/svn/hiva/sandbox> svn diff file1.txt
Index: file1.txt
===================================================================
--- file1.txt (revision 6)
+++ file1.txt (working copy)
@@ -1 +1,5 @@
xxx
+yyy
+zzz
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-27 05:20:23 CEST