[TSVN] Re: Feature branch merging (was Merge dialog)

matthew ford wrote:
> So all this talk about remembering the last revison merged is
> actually about updating the branch from the trunk.

Remembering the last revision merged is necessary any time you may need
to merge tree A to tree B more than once. The feature branch might takes
weeks to develop, and you need to merge in changes from the trunk maybe
once a week, to avoid getting too far out of sync. So you end up having
to merge trunk changes into the branch in several chunks.

> The final merge from the branch back to the trunk just uses the last
> revisions.

Correct. Because in that instance the branch already contains _all_ the
trunk changes, as well as its own development. That merge uses the diff
between trunk and branch, and it is entirely different from the ones
done earlier where you diff a range of revisions on trunk to apply to
the feature branch. That final merge is a one-time event, because then
the trunk becomes identical to the branch. There is no need for the
branch to exist separately any more, and it is normally deleted as a
tidy up (and to stop anyone else committing there by mistake). So (after
long explanation) there is nothing to remember.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org