Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: flex-dev@incubator.apache.org
Received-SPF: pass (nike.apache.org: local policy)
From: "Michael A. Labriola" <labriola@digitalprimates.net>
To: "flex-dev@incubator.apache.org" <flex-dev@incubator.apache.org>
Subject: RE: SVN and issues with branching / consider how we use SVN going
 forward
Thread-Topic: SVN and issues with branching / consider how we use SVN going
 forward
Thread-Index: 
 AQHNdEtPdbTjzeEA70iDrxqHXEdxgZdOB5aAgAA6lACAABThAIAAcYAAgAAL9ICAAALCgIAAcOeAgAAM3ACAAGSIgIAAF8eAgAABSACAAAciAIAAPt0wgAALVhKAABvMkA==
Date: Wed, 8 Aug 2012 18:36:44 +0000
Message-ID: 
 <EB6F7A48D477254EAB8F675582F80CD7267CFEE4@DPSBS1.digitalprimates.local>
References: 
 <EB6F7A48D477254EAB8F675582F80CD7267CFB18@DPSBS1.digitalprimates.local>
 <CC47E77A.4425C%aharui@adobe.com>
In-Reply-To: <CC47E77A.4425C%aharui@adobe.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

>Interesting read.  Are you also pushing to make Git the default SCM?
>
>I'm not sure how far away we are from this model in some respects.  We hav=
e whiteboards which sort of decentralize new development, and I am proposin=
g an "unstable" branch that maps to the "develop" >branch in the article (a=
nd "master" is "trunk").
>
>I don't know that I'd go with release branches if we can get enough folks =
to pound on the promotions from unstable to trunk when they go in.
>
>And to answer Justin's question, merging by revision number worked pretty =
well for us.  But yes, every once in a while you will hit merge-hell.  I'm =
just saying it is worth it in order to protect the integrity of trunk.

If it's possible, yes, I really do think Git would help. The reason is that=
 dealing with merge issues in Git are infinitely easier and, at least 95% o=
f the time, keeps us out of the merge-hell that I think Justin legitimately=
 fears.

The one nice thing about the release and feature branches is that it allows=
 people to start working toward future releases and grand visions while a c=
urrent release is being stabilized. For example the code many had in whiteb=
oards that was destined for future releases.

Mike