[Python-Dev] forward-porting from 3.1 to 3.2 to 3.3

[Antoine Pitrou]

On Sun, 13 Mar 2011 00:24:07 +0200
Nadeem Vawda <nadeem.vawda at gmail.com> wrote:
> On Sat, Mar 12, 2011 at 1:29 PM, "Martin v. Löwis" <martin at v.loewis.de> wrote:
> > Isn't that command correct only if you are merging into default?
> > ISTM that it should be "hg revert -ar <targetbranch>".
> 
> In general, yes. However, the existing text refers specifically to the
> case of merging 3.2
> into default, so I was trying to be consistent with that.
> 
> The current text, after my proposed change, will be:
> 
> hg update default
> hg merge 3.2
> hg revert -ar default
> hg commit

Thanks for pointing this out. I've fixed the error.

Regards

Antoine.