[Scummvm-devel] Git/Mercurial branch workflow suitable for ScummVM
Ori Avtalion
ori at avtalion.name
Sun Apr 11 22:42:17 CEST 2010
Here's a blog post that has been making the rounds lately:
http://nvie.com/git-model
It suggest a way of working with branches to manage a project, and it's
very similar to ScummVM's release cycle:
1) Development "trunk" that gets forked into a release branch
2) Critical changes in the release branch are merged back into "trunk",
where regular development is ongoing
3) Releases are tagged.
This blog post is also a good example on how the current svn-based
release cycle can be improved with a branch/merge-friendly VCS, while
still being relatively easy to follow.
The concept is applicable to both Git and Mercurial. When the project
finally chooses to move to a new system, a workflow everyone will follow
needs to be decided in order to keep the history in some kind of order
(instead of merge-spaghetti).
Consider this example a starting point for the discussion :)
-Ori
More information about the Scummvm-devel
mailing list