On Sun, 13 Mar 2011 00:24:07 +0200 Nadeem Vawda <nadeem.va...@gmail.com> wrote: > On Sat, Mar 12, 2011 at 1:29 PM, "Martin v. Löwis" <mar...@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. _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
