[Python-Dev] Hg: inter-branch workflow

[Jesus Cea]

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

On 17/03/11 14:10, Brian Curtin wrote:
> On Thu, Mar 17, 2011 at 07:41, Jesus Cea <jcea at jcea.es
> <mailto:jcea at jcea.es>> wrote:
[..]
>     Each developer is responsible of merging HIS heads. If somebody
>     "forgets", nothing wrong will happens. And no patch is left behind,
>     because you can see unmerged patches with "hg heads", and bug their
>     owners.
> 
> 
> That just makes more work.
> 
> 1. I, being new to hg, might not realize my error and just think I'm
> done. I move on with life.
> 2. Someone has to notice the additional head then contact me.
> 3. Now I have to go back and figure out not only what I did wrong, but
> what I have to do to correct it.

But thinking that you are done is already a problem now, and everybody
must deal with your unmerged head doing whatever trick to keep your head
apart and don't merge it automatically. That is burdensome and error prone.

I would guess that most people would merge your head themselves, just
for convenience. And that would not be your plan if, for instance, your
patch is being tested/half done/whatever.

Allowing multiple heads, your patch is still there, but nobody suffers
for it. If fact, if you don't care, your patch will sit out of the tip
line and will be not actually integrated in the "tip" code. So you must
merge it, but nobody has to pay any price just because you "forgot" :).

- -- 
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/

iQCVAwUBTYIMk5lgi5GaxT1NAQJPaAP/fJv2IKHQycxyfg4xkZaqQe/VbxrpfAeV
l4Q6nQKYXKCFyTGrlh0Hx6Kb8lkdR+H1KOGWQ7tZVDITLvnK4YBYXj6Be4Uoddn8
H/zsJYAHz1rGKmkq1erY5+ejZpQ2BhUnPqz20yomACG/hUCXH+KI7kf5yqZ27fTx
5c/all+SNNg=
=XNMs
-----END PGP SIGNATURE-----