Hi, From the discussion about the development workflow, some complaints were the missing of branches (called in mercurial named branch). I still don't know if we should switch to named branch or not but to see what it could be I created a testing repository [1] with all named branches by merging all the clone branches of trytond.
I made the choice to not rewrite the history (rewrite history is bad)
and so keep old clone branch are in the default named branch and I just
created named branch for the future. (So it will be possible to pull
from any clone branch from this new repository.)
Once we have such repository, there are two workflows to maintain the
series:
- by cherry picking, it is the already used workflow (with
transplant). The advantage will be to use “graft” which could use
the internal of mercurial to make better conflict merge than
“transplant”.
So with this way, there will be no change in the development and
we could still push fixes in trunk/default and backport one week
later to old affected series
- by merging branch, this workflow is about fixing the bug in the
oldest branch affected and then merging the fixed branch to the
upper one and so on. In this workflow, we will no longer have the
one staging week before commiting fixes in series and we will need
to ask to contributor to provide such complex patches or the
developpers will have to commit them instead of contributor. But
it will have the advantage to make the decision about which
branches must be fixed on early stage and also share the
responsability of maintaince of series to all developpers.
For the current testing script, it will need to be adapted because it
uses in “incoming” command so it will need to use the “-b” option.
It will still be possible to work with one directory per series by using
the “share” extension [2].
So the discussion is open…
PS: by the way, I did null merge between each branches before creating
them.
[1] http://www.b2ck.com/~ced/hg/hgwebdir.cgi/trytond-named-branch
[2] http://mercurial.selenic.com/wiki/ShareExtension
--
Cédric Krier - B2CK SPRL
Email/Jabber: [email protected]
Tel: +32 472 54 46 59
Website: http://www.b2ck.com/
pgpG3ypjElPM3.pgp
Description: PGP signature
