2008/12/21 golan davidovits <golandav_at_yahoo.com>:
> Simon, thanks for your comments.
> I do read the documentation before posting the forum, but the difference between the 3 merge options is not clear.
>
> From previous threads i had in this forum, i got into conclusion that i need to use the "Range of Revisions" merge option with no revisions
> for both "trunk->branch & branch->trunk merges (I understood that using this method will still maintain the mergeifno property).
>
> Also, i understood that "Reintegrate" is for 1 time only branch->trunk merge which is not good for us since we work in branch reuse mode.
> BTW, i don't really understand what's in this option that makes is good for 1 time merge usage.
>
> Now, i wanted to realize if we have use case for selecting 2 tress merge. I thought it's a "copy merge" - makes 1 branch WC looks like another branch (just copy the files).
> Considering your reply and assuming we always do trunk->branch merge first, is there any difference between doing "Range with no revisions" merge to "2 trees" merge?
> Also, do you have any suggestion about the error i mentioned?
I was going to write my own reply here - but then I found this blog
post (http://blogs.open.collab.net/svn/2008/07/subversion-merg.html)
which explains it all far better than I could do!
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=988752
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-21 08:52:58 CET