Feature branches [was: issue-3390-dev branch question]

[Julian Foad <ju...@btopenworld.com>]

C. Michael Pilato wrote:
> Julian Foad wrote:
> > That branch is a "feature branch" in terms of how we should merge to and
> > from it. What this means is that we should from time to time "catch up"
> > with changes that have been made on trunk, by merging all eligible
> > changes from trunk to the branch.
> 
> It is not the case that we universally maintain feature branches in this
> fashion, [...]

Oh... is it not?  I mean, it's the branch's "parent" branch that we
catch up from, not always trunk, but in what other way do we consciously
maintain a feature branch?

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403778

Re: Feature branches [was: issue-3390-dev branch question]

["C. Michael Pilato" <cm...@collab.net>]

Julian Foad wrote:
> C. Michael Pilato wrote:
>> Julian Foad wrote:
>>> That branch is a "feature branch" in terms of how we should merge to and
>>> from it. What this means is that we should from time to time "catch up"
>>> with changes that have been made on trunk, by merging all eligible
>>> changes from trunk to the branch.
>> It is not the case that we universally maintain feature branches in this
>> fashion, [...]
> 
> Oh... is it not?  I mean, it's the branch's "parent" branch that we
> catch up from, not always trunk, but in what other way do we consciously
> maintain a feature branch?

Sometimes we never sync the feature branch with the parent branch, and opt
to deal with conflicts only once (when merging back into the parent) rather
than at every sync opportunity.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403820