[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Branch management. Merge tracking.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-12-08 17:11:55 CET

On Dec 8, 2004, at 8:58 AM, Nick Patavalis wrote:
> Can I omit the intermediate "commit"?

Not easily. Not without careful repeated merges of ranges that exactly
omit the one commit.

> Is there a better, or
> more-canonical way to do it altogether?

This is why we need merge tracking, to avoid repeated merges. :-)

But here's an example of what I'm doing now:

   - I'm developing a new feature on a very long-lived branch
   - once a week, I merge *all* trunk changes to the branch, that is,
     all those changes that happened since the last time I merged.
   - when the feature is finished, I'm doing to ask 'svn merge' to
     trunk@HEAD with branch@HEAD: the resulting patch will be only
     changes made to the branch.

This technique works, as long as you're merging contiguous ranges of
revisions, and not "cherry picking" specific changes.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 8 17:26:03 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.