Re: Merge Confusion. Why 2 methods?

On Sun, 06 Jan 2008 10:51:41 -0800, Dextor wrote:

> Hi,
>
> I've been using TSVN for 2 years and I'm still confused about merging.
> The user guide describes how to 'Merge A Range of Revisions' and 'Merge
> Two Different Trees' (Sections 5.17.1 and 5.17.2 of the 1.4.5 guide) but
> I don't see why they don't amount exactly the same thing. I must be
> missing a point somewhere! The guide isn't clear as to when I would use
> one or the other methodology. I guess that I must be doing it right
> because I've never lost anything as a result of a bad merge. Could
> somene tell me when/why I would use one or the other merge methods and
> give me clear senarios?

The key thing to remember is that svn merge operates on tree differences.
Not branches, not trunk. I don't know what TSVN is suggesting but usually
how you merge depends on how you developed beforehand.

If you developed on a branch and regularly merged everything from trunk,
then when you want to merge your changes back to trunk, you do a merge
based on comparing trunk and your branch (which is a tree difference).
There are some minor details here that I have left out however.

If you developed on a branch and never merged anything, then when you
want to merge your changes back to trunk, you do a merge based on
comparing the start revision of your branch and the HEAD revision of your
branch (again a tree difference, but in time.

-- 
Sohail Somani
http://uint32t.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org