[python-committers] [PSF-Members] Code Simplicity » Open Source Community, Simplified

[Jesus Cea]

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

On 04/02/11 17:51, Barry Warsaw wrote:
> Sure.  I guess my question is, what do *you* do in that case?  Are
> you blocked because I didn't do my job properly?  Can you tell your
> merge to ignore my change so you can keep making progress, complete
> your patch, and send me a nastygram to finish my work? :)

You can, but is not trivial neither automatic.

There are quite a few strategies. For instance, I can move my patch
BEFORE your patch (vía rebase), creating a new head, and merging my head
with trunk. My head is solved. Yours is still hanging around.

Or you can force this via a push "hook": no heads left behind! :-)

I just wrote an email about this.

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

iQCVAwUBTUxJxJlgi5GaxT1NAQJejwQAmrR9PuJmvL/FcKHYirsKk5A0gvoebG8v
Sd7baUi3dfcWR4HEsJa5SLc1knY+f/wlFyDzd0fYx102+QMgYUiipp8n9r3+yXfN
PSR1tREix93Zbb2dlfkSQe6L0+pfz6hXZRNHMBCgN9EFpIspcD05/yZVISwsBHyG
80EKgV1+FGg=
=2D3a
-----END PGP SIGNATURE-----