-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 09/01/12 22:52, Nicolas Pomarède wrote:
During this week (4 remaining days), please commit only
typos/docs/major regressions (hopefully not !), but avoid adding
new code for things that are not directly related to a bug in
1.6.0.
You are using Mercurial, a modern distributed version control system.
Embrace it! :-).
With a properly designed workflow, you don't need to defer commits for
post 1.6.1 while finishing 1.6.1. You can keep the two lines in
parallel for a while.
If you want to pursuit it, I can help Hatari dev-team to decide about
an appropriate workflow.
Example:
Since this is a "small" project with few committers, an option is for
devels to clone their local repository replica: a local copy for 1.6.1
commits and another for post 1.6.1. When 1.6.1 is released, the
delayed post-1.6.1 commits are pushed. This is OK but suboptimal,
since different developers can't share post-1.6.1 work easily.
A possibly better option is to have two branches: release and devel,
for instance. You work in "devel" until release time is close. Then
you merge "devel" to "release". You patch "release" until it is ready,
and you tag the release when the release is actually done. Meantime,
people keeps working in "devel". The rule is that patches to "release"
are merged to "devel", so "release" is a subset of "devel".
This is the approach for Mercurial development itself. And many others.