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

Re: 2-way merging - bad?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-24 01:38:00 CEST

On Jun 23, 2005, at 4:52 PM, John Browne wrote:

> Understood. So, in your scenario you are using feature branches.
> This makes sense to me. You want to keep your feature branch up to
> date with what's going on from the trunk. But, how would release
> branches come into the picture? And, if there is a critical bugfix
> for a particular release, to what branch would you apply the bugfix
> (trunk or release) and which direction would you port it back?
>

Release branches are easy: the merging only goes in one direction.

Once a release branch is created, it *only* ever receives bugfixes
from trunk. In other words, all new bugs/features are committed to /
trunk, then selected things are merged to the release branch.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 24 01:47:28 2005

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