[Scummvm-devel] Towards a new release branch model

Marcus Comstedt marcus at mc.pp.se
Wed Jun 1 14:17:15 CEST 2011


Tarek Soliman <tarek-spam at zeusmail.bounceme.net> writes:

> At a basic level there are 3 branches.
>
> There is a release branch where every commit is a release. That branch is a sink.
> There is a develop branch where it is like the current master.
> There is a hotfix branch (for putting in the quick fixes that cannot wait for the next release)
>
> The release branch shouldn't be merged back to anything.
> The hotfix branch does get merged back to release of course for the hotfix. It can also be merged back to develop.
[...]
> Changes that are specific to releases would happen on a hotfix branch

That just changes the names, and not the problem.  So all bugfixes
done during the release sprint would go to a branch called "hotfix"
instead of "release-n.n".  Same thing.  The issue is what to do when
there are some fixes on that branch which should be on master, and
some which should not.  Getting a conflict is a less than ideal
situation, and you're not even guaranteed to get that...


  // Marcus





More information about the Scummvm-devel mailing list