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: domain of aharui@adobe.com designates
 64.18.1.33 as permitted sender)
From: Alex Harui <aharui@adobe.com>
To: "flex-dev@incubator.apache.org" <flex-dev@incubator.apache.org>
Date: Thu, 16 Aug 2012 09:48:49 -0700
Subject: Re: Getting To Git (was Re: [MENTORS] Current Branching Strategy
 Vote Results)
Thread-Topic: Getting To Git (was Re: [MENTORS] Current Branching Strategy
 Vote Results)
Thread-Index: Ac17jNdJStcSuTetRi2n6v2hFihzuAAQir4P
Message-ID: <CC527281.44B4D%aharui@adobe.com>
In-Reply-To: <B64B26F5-CA99-441F-B6EB-C9E84F0E8571@classsoftware.com>
Accept-Language: en-US
Content-Language: en-US
user-agent: Microsoft-Entourage/13.11.0.110726
acceptlanguage: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0


On 8/16/12 1:54 AM, "Justin Mclean" <justin@classsoftware.com> wrote:

> Hi,
>=20
>> It is going to be a bit before we can answer all these questions.  From =
the
>> git branching model, we need master (trunk) and the develop branch right
>> away.
> So any changes I wanted to commit I'll need to commit to develop branch o=
nce
> it exists?=20
Yes, and Carol just created it so "svn switch" to it and continue on.

> How exactly is it decided that the branch should then be merged
> with trunk?=20
I expect there to be a discussion about cutting a release shortly, then whe=
n
folks agree, we'd cut a branch from "develop" to make a release branch,
finish the release there and merge to both trunk and develop.

> How do we keep the develop branch in a state in which that is easy
> to do. Do we need to create other branches for things that might need som=
e
> more testing/may not be 100%?
Yes, create branches for stuff that will break the build.  There will be
differing opinions on this, but I think it is ok to check anything into
develop that doesn't break the build.  So, you don't really need to branch
to add a new locale, for example.
>=20
> For example let say I want to work on something like getting Mustella wor=
king
> with filenames with spaces. I check out the develop branch, then I get to=
 a
> point were I almost have it working but not quite so I can't check it bac=
k
> into develop as it's not 100%. How do I then share that with other people=
 can
> work on it/help me out? (With SVN not Git.) Do I need to create another S=
VN
> branch, merge my changes in develop with that and check that new branch b=
ack
> in as a feature branch or do something else? Or do we just do this on a c=
ase
> by case bases so it's not really the gitflow model but more like the 3 Ti=
er
> SVN model?
I would plan my changes so as not to break "develop" so I can just check it
in and share it even though it isn't 100% complete.  If I can't do that I
would create a branch and folks can get at that branch from SVN if they wan=
t
to see what you are doing.
>=20
> Thanks
> Justin

--=20
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui