flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Getting To Git (was Re: [MENTORS] Current Branching Strategy Vote Results)
Date Thu, 16 Aug 2012 16:48:49 GMT

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

> Hi,
>> 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 once
> it exists? 
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? 
I expect there to be a discussion about cutting a release shortly, then when
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 some
> 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.
> For example let say I want to work on something like getting Mustella working
> 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 back
> 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 SVN
> branch, merge my changes in develop with that and check that new branch back
> in as a feature branch or do something else? Or do we just do this on a case
> by case bases so it's not really the gitflow model but more like the 3 Tier
> 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 want
to see what you are doing.
> Thanks
> Justin

Alex Harui
Flex SDK Team
Adobe Systems, Inc.

View raw message