Hi there, I could use a hand trying to understand where my merge command
or concepts are breaking down.
I have following scenario:
@ 10 trunk (contains 10 folders)
@ 11 branch (from trunk contains the above 10 folders)
@ 12 I delete 5 folders from my branch
@ 13 I use "svn merge --record-only url-to-branch trunk-wc" to record
the deletion of the 5 folders from my branch i.e., when I do a real
merge I don't want to delete these 5 folders from my trunk. Note
revision 13 is created by me committing my trunk wc that was just merged
into.
@ 14 commit some changes to branch
@ 15 add some new files to branch
Now if I try to merge my branch back to my trunk I run into, what I
believe is, weird merge results:
- create trunk wc
- svn merge -c 14 url-to-branch .
results of the above merge show exactly what I expect i.e., the file
changes made in branch_at_14 are now in my trunk wc
- svn -u st shows that all 10 trunk wc folders have had their properties
modified, closer investigation reveals that the svn:mergeinfo property
on SOME of the branch removed folders has been deleted but it is also
putting Reverse-merged in front of the PATH:REV that was previously in
the mergeinfo property for this folder.
I realize that my problem definition is weak but if anyone has seen
issues similar to this please let me know what your findings were.
This is my first real merge so I am considering DELETING the mergeinfo
property from my entire tree to see if I can make these reversed merge
issues go away. Either that or I simply commit this to my trunk but I
don't have an understanding as to what this will mean in my trunk?
thanks-
reagan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1869649
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-23 03:38:28 CEST