[Python-Dev] hg merge flow

[Antoine Pitrou]

On Sun, 06 Mar 2011 00:44:03 +0100
"Martin v. Löwis" <martin at v.loewis.de> wrote:
> How should patches be applied to the cpython repository if they
> land in more than one branch?
> 
> More specifically, assuming I want to patch all of 2.7, 3.1, 3.2, and
> default - how do I apply the patches and how do I merge?

(reposting my answer from another thread)

- on one hand: 2.5 -> 2.6 -> 2.7 (if you still want to maintain 2.5)
- on the other hand: 3.1 -> 3.2 -> default

Whether you start with 2.x or 3.x is unimportant.

Regards

Antoine.