[Python-Dev] Hg: inter-branch workflow

[Jesus Cea]

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

On 17/03/11 04:41, R. David Murray wrote:
> Dealing with a null merge when someone else has committed between the
> time I started the merge dance (I always pull just before I start that)
> and the time I push is not that hard either.  It pretty much amounts to
> having to do an additional set of merges.  (In my case I do a strip and
> restart my merge dance, but I'm not sure I should recommend that since
> altering history is considered dangerous :).

Could you possibly describe your current approach, marking it with a
huge "NOT SAFE; AT YOUR OWN RISK" banner?. I wonders how other people
manage this.

I too do a "pull" before doing the merge, but I don't push each merge
separatelly but I do the all the merges locally and then do an unique
push. Than can take some time, moreover if I run the complete testsuite
in all changed branches. Resolving a "+1 head" here is tricky, if I
*WANT* the other developer to manage her own merging by herself. As it
should.

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

iQCVAwUBTYGJ65lgi5GaxT1NAQII3wP/fiHkDs5xFP9hK/3tWxFSrovdSoOOTzKT
py7J2P1Ys1nQAw9ylfDiq6oFPGuc22pSqBrO2MgLlGs1a5i9XBSDhA6yCvRW6i4C
CoPMmVXigEeZXpEBGpYWtjSO7pIvPQxPCjMH6zlHWwD+jg6RhqBQrz/yacKQdNzw
7auugDVYyD0=
=uAdh
-----END PGP SIGNATURE-----