[Python-Dev] Hg: inter-branch workflow

[Jesus Cea]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 17/03/11 00:20, Antoine Pitrou wrote:
> That's not my experience.
> Often, when the resolution on other branches is deferred, it means the
> committer has actually forgotten about it.

I agree with this impression. Personally when I have a "pending branch",
I keep a firefox tab open in the issue, as a "reminder". It bugs me a
lot. And that is the point.

Most of the time, I push all the changesets for all branches in a single
operation. The (mainly) only time I could push a single branch is if I
want to try the patch in the buildbots first, before applying to all
relevant branches. And I try to avoid it, because I know some other
people are going to have issues when doing their own merges trying not
to merge my changeset themselves, specially newbies (the +1 head thing).

I agree that half the changesets are merges now. But that is an artifact
of our commit culture (create a patch, commit inmediatelly). Another
approach would be to spend some time writing patches, committing locally
and doing a giant merge & push at the end of the week :-).

(DIGRESS: If buildbots could download & test a remote arbitrary HG
repository, it would be a big improvement for this, and a galaxy-size
security hazard :-p... Although now any "pusher" can break-in any
buildbot machine simply pushing some ugly test code, of modified
"configure" script.

Uhm... Maybe a wiki about how to set up a "chroot" buildslave would be
something to think about... Any info about this?)

The good thing about merging so frequently is that mergin is easy,
painless and every committer must go thru it for her own patches,
instead of putting that responsability on somebody else. "hg log" can be
a bit unusual for us, but pretty moot. we are getting used to it, yet.

No forgeting up-porting changesets is a massive improvement with the
late svnmerge practice (nobody cared about automatic merging, but
merging by hand anyway, cherrypicking revisions).

- -- 
Jesus Cea Avion                         _/_/      _/_/_/        _/_/_/
jcea at jcea.es - http://www.jcea.es/     _/_/    _/_/  _/_/    _/_/  _/_/
jabber / xmpp:jcea at jabber.org         _/_/    _/_/          _/_/_/_/_/
.                              _/_/  _/_/    _/_/          _/_/  _/_/
"Things are not so easy"      _/_/  _/_/    _/_/  _/_/    _/_/  _/_/
"My name is Dump, Core Dump"   _/_/_/        _/_/_/      _/_/  _/_/
"El amor es poner tu felicidad en la felicidad de otro" - Leibniz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQCVAwUBTYGG55lgi5GaxT1NAQLEDwP+L3AsqeXMpgEOKJFW6gqs0ahjbqF61Ao5
zThKWqXQoAyDm+21bT8aJR3Ogrix+dI37PrTRa6B8L+S2tDh3PdG984tOUOsGUvp
KNa+GSNai1OotfLUebBhCvGlPAapQnWK9xoELYjO8Lo7YTkfWspXGv5e3exIQQJp
AmunpKy1I3U=
=gS+8
-----END PGP SIGNATURE-----