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].