Re: merge 2 trees

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?

Thanks,
gzd
 

----- Original Message ----
From: Simon Large <simon.tortoisesvn_at_googlemail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Sunday, December 21, 2008 1:56:00 AM
Subject: Re: merge 2 trees

2008/12/20 golan davidovits <golandav_at_yahoo.com>:
> Hi,
>
> I was wondering what is the merge 2 different trees use case. My assumption is that it's for making a working copy of one ranch look like another branch (instead of doing export and overriding the target working copy). Also, I have noticed that if the trees are too different i get an error in merge that some folder is locked and i should run cleanup.But the working copy is new and cleanup doesn't help to resolve it.
>
> Do i understand the trees merge use case correctly? Is there a known reason and solution for the error?

Please read the documentation. Merging two trees is typically done
when a feature branch is complete and it need to be merged back to
trunk, after having synchronised all trunk changes into the branch.
The net result after the merge is that trunk looks exactly like the
branch. If you have merge tracking on the server and all clients then
you could use the simpler re-integrate merge in this case, but it does
have some limitations. If you have no merge tracking, or you have made
tree changes then reintegrate will not work and you have to fall back
to the tree merge.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\    http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=988602
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=988726
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].