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

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

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 05 Oct 2009 13:16:55 -0400

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 <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2009-10-05 19:17:17 CEST

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

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