incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Omar Gonzalez <omarg.develo...@gmail.com>
Subject Re: How to Merge Unstable Branch (was: [POLL] Use Unstable Branch)
Date Thu, 09 Aug 2012 01:35:20 GMT
On Wed, Aug 8, 2012 at 3:50 PM, Alex Harui <aharui@adobe.com> wrote:

>
>
>
> On 8/8/12 3:19 PM, "Justin Mclean" <justin@classsoftware.com> wrote:
>
> > No one has yet answered this:
> > How can you merge from unstable to trunk persons A changes when the
> unstable
> > branch contains persons A, B, C, D, E and F changes and each person may
> of
> > made multiple check ins at different (overlapping) times?
> >


This is an example of a good branching model:
http://nvie.com/posts/a-successful-git-branching-model/

While this article is about Git, the branches practices described in the
article can be applied to SVN. Because of the way the branches are set up
and used this should ensure that patches are always being made off of a tag
that is currently stable. The 'unstable' branch in this example is the
"dev" branch, which would be where new code is merged back in. Whenever
creating new feature or applying fixes than we can branch off of "dev" if
its for the next release, or off a version tag if its a bug fix for a
specific version. We can then move those fixes from version to version and
fix issues in each if they should arise, like say a fix in 3.5 is done one
way but because of arch changes in 4.0 the fix must be applied differently,
this branching model addresses that. I've used it successfully on a few
projects, but in Git, not SVN. But I believe it could work for SVN as well.

-omar

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message