[python-committers] When do we stop automerging from trunk to py3k?

[Jesus Cea]

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

On 27/04/10 15:01, Chris Withers wrote:
> Michael Foord wrote:
>> Allegedly merging between branches will be easier with Mercurial
>> anyway...
> 
> I hope an Hg expert can show how this can be done...
> 
> In particular, we don't want to pull all changes to 2.7 into 3k, and I
> haven't seen any sane way in Hg to say "just pull this changeset, no
> others"...

There are extensions for it.

For instance <http://mercurial.selenic.com/wiki/TransplantExtension>.

Anyway, a possible simple workflow is to write patches for the older
supported python version and merge them in newer versions, adjusted or,
possibly, "backout"ed.

That is, patch 2.7 and "push" those changes to 3.x, undoing the
unnecesary patches with a simple "backout".

This is far more automatic that cherrypicking patches, with the risk of
forgeting some.

I can't wait for HG native use, and I am curious about the exact
workflow we are going to use.

- -- 
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.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQCVAwUBS9efgplgi5GaxT1NAQIT2QP9FCHzsKkBkZyOdkf5Zydnv65YUhEiVFre
tGVMqfuP4XtzLSdGDUHBJYqg1Bw6piuzNtyTOGTvE7J70LfZsdvDOPo7gByKHdXp
KkcrFruvqjN/Ff7ozJsnvT0rmBDUjGEt9PjrpTGUd3yMgWq42CJqe1j/KRiMuRRH
dXz7UXTBBow=
=sO/M
-----END PGP SIGNATURE-----