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

matthew ford wrote:
> Thanks Simon,
>> 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).
>
> Actually was working along the lines of a long lived private branch
> that I worked on and committed to the trunk at every milestone.

Yes, you're right that will work just as well. After merging the branch
back to trunk, trunk and branch are identical so it looks the same as if
you had just created that branch. But in that case you _will_ need to
remember the branch->trunk merge-back point, so that when you continue
with your weekly sync merge from trunk to branch, you know where to
restart. What you need to avoid then (and this will sound confused) is
merging the results of the big branch->trunk merge _back_ into the
branch again.

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