Merge doesn't seem to be doing what I expect with 1.5.2 on both server and
client. See the following annotated script:
corolla% svn diff -c 7117 # Verify we have changes
in the changeset
Index: lxkbb
===================================================================
--- lxkbb (revision 7116)
+++ lxkbb (revision 7117)
@@ -464,7 +464,13 @@
[elided]
@@ -494,13 +500,13 @@
[elided]
@@ -526,9 +532,12 @@
[elided]
corolla% svn diff lxkbb # Verify no
local changes
corolla% cp lxkbb lxkbb-start # Save a copy
for reference
corolla% svn merge -c 7117 https://svn:8043/mls17/bitbake/trunk/bin/lxkbb
lxkbb
<43/mls17/bitbake/trunk/bin/lxkbb lxkbb # I guess the changes
are already in place
corolla% diff lxkbb lxkbb-start # But make sure
we didn't change anything
corolla% svn merge -c -7117 https://svn:8043/mls17/bitbake/trunk/bin/lxkbb
lxkbb
<043/mls17/bitbake/trunk/bin/lxkbb lxkbb # Take out the changes -
looks good so far....
--- Reverse-merging r7117 into 'lxkbb':
U lxkbb
corolla% diff lxkbb lxkbb-start # Except it
didn't do anything!
corolla%
Am I expecting the wrong thing? I thought I was merging the changes from
7117 back into this workspace, and when that didn't do anything, merging
those changes out of the workspace. Visual inspection shows me that the
changes aren't in the workspace, so when nothing happened, I was a bit
surprised. However, when the second merge said it changed lxkbb but then
didn't actually do anything - that sort of startled me.
Shouldn't at least one of those two merges - starting with the same file -
either actually do something or complain about conflicts?
Any clues as to what migh cause this behavior?
Thanks
<mike
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1751453
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-16 19:37:52 CEST