Re: [Python-Dev] Hg question

2011-04-13 Thread Nick Coghlan
On Wed, Apr 13, 2011 at 4:35 AM, Alexander Belopolsky alexander.belopol...@gmail.com wrote: I was preparing a commit to 3.2 and default branches and mistakenly used -m insread of -l commit option.  As a result, I have If you had caught the change before merging to default, then hg rollback

[Python-Dev] Hg question

2011-04-12 Thread Alexander Belopolsky
I was preparing a commit to 3.2 and default branches and mistakenly used -m insread of -l commit option. As a result, I have $ hg out comparing with ssh://h...@hg.python.org/cpython searching for changes changeset: 69272:0bf1354fab6b branch: 3.2 parent: 69268:bfc586c558ed user:

Re: [Python-Dev] Hg question

2011-04-12 Thread Sjoerd Mullender
On 2011-04-12 20:35, Alexander Belopolsky wrote: I was preparing a commit to 3.2 and default branches and mistakenly used -m insread of -l commit option. As a result, I have $ hg out comparing with ssh://h...@hg.python.org/cpython searching for changes changeset: 69272:0bf1354fab6b

Re: [Python-Dev] Hg question

2011-04-12 Thread Martin v. Löwis
I would like to replace m.txt in the summary with the content of the file m.txt. I tried to use the recipe [1], but qimport fails: I'd use hg export: hg export -r 69272:tip ../patch Edit patch to update commit message cd .. rm this_clone hg clone clean_cpython this_clone cd this_clone hg

Re: [Python-Dev] Hg question

2011-04-12 Thread Victor Stinner
Le mardi 12 avril 2011 à 14:35 -0400, Alexander Belopolsky a écrit : I was preparing a commit to 3.2 and default branches and mistakenly used -m insread of -l commit option. As a result, I have $ hg out comparing with ssh://h...@hg.python.org/cpython searching for changes changeset: