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

2011-03-12 Thread Éric Araujo
>> You can’t combine the -r option with other options. (Yes, it’s a known >> bug.) > Are you sure? It just worked here: [...] > (perhaps you're thinking of -R instead?) Exactly. >> On an unrelated note, you can use “-r .” to tell Mercurial to find the >> branch name from the working directory in

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

2011-03-12 Thread Antoine Pitrou
On Sat, 12 Mar 2011 23:43:52 +0100 Éric Araujo wrote: > > hg revert -ar default > > You can’t combine the -r option with other options. (Yes, it’s a known > bug.) Are you sure? It just worked here: $ hg rev -ar default reverting README (perhaps you're thinking of -R instead?) > On an unrelat

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

2011-03-12 Thread Nadeem Vawda
On Sun, Mar 13, 2011 at 12:43 AM, Éric Araujo wrote: >> hg revert -ar default > > You can’t combine the -r option with other options.  (Yes, it’s a known bug.) It seems to work for me (Mercurial 1.6.3 on Ubuntu). But I suppose it wouldn't hurt to split the options up. Regards, Nadeem ___

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

2011-03-12 Thread Éric Araujo
> hg revert -ar default You can’t combine the -r option with other options. (Yes, it’s a known bug.) On an unrelated note, you can use “-r .” to tell Mercurial to find the branch name from the working directory instead of having to remember and retype it. Regards ___

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

2011-03-12 Thread Antoine Pitrou
On Sun, 13 Mar 2011 00:24:07 +0200 Nadeem Vawda wrote: > On Sat, Mar 12, 2011 at 1:29 PM, "Martin v. Löwis" wrote: > > Isn't that command correct only if you are merging into default? > > ISTM that it should be "hg revert -ar ". > > In general, yes. However, the existing text refers specifically

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

2011-03-12 Thread Nadeem Vawda
On Sat, Mar 12, 2011 at 1:29 PM, "Martin v. Löwis" wrote: > Isn't that command correct only if you are merging into default? > ISTM that it should be "hg revert -ar ". In general, yes. However, the existing text refers specifically to the case of merging 3.2 into default, so I was trying to be co

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

2011-03-12 Thread Martin v. Löwis
Am 12.03.11 04:03, schrieb Nadeem Vawda: Hmm... it seems that the given instructions don't actually work. "hg revert -a" fails, saying that a specific revision needs to be provided. The command should be "hg revert -ar default". Isn't that command correct only if you are merging into default? I

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

2011-03-12 Thread Nadeem Vawda
Hmm... it seems that the given instructions don't actually work. "hg revert -a" fails, saying that a specific revision needs to be provided. The command should be "hg revert -ar default". ___ Python-Dev mailing list Python-Dev@python.org http://mail.pytho

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

2011-03-12 Thread Nadeem Vawda
On Sat, Mar 12, 2011 at 9:32 AM, Eli Bendersky wrote: > The devguide's recommendation is to "forward-port" changes withing a major > release line, i.e. if I need something in all 3.[123], then start with 3.1 > and forward-port (by "hg merge ") to 3.2 and then 3.3 > > Just to clarify - does this me

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

2011-03-11 Thread Eli Bendersky
The devguide's recommendation is to "forward-port" changes withing a major release line, i.e. if I need something in all 3.[123], then start with 3.1 and forward-port (by "hg merge ") to 3.2 and then 3.3 Just to clarify - does this mean that all changesets that are applied to 3.2 eventually get to