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

[Antoine Pitrou]

Le mardi 27 avril 2010 à 14:01 +0100, Chris Withers a écrit :
> 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"...

Depends what you call "sane". There's the transplant extension, which
aims precisely at managing cherry-picked patches. Otherwise, just "hg
import" of a patch. Both don't seem more sophisticated/automated than
the current workflow.

Regards

Antoine.