cannot commit over an applied mq patch
Roman Kennke
roman.kennke at aicas.com
Thu Jul 31 08:40:37 CDT 2008
Hi,
it turns out that there is a patches repository on top of the patches
repository. According to the shell history this has been created by the
following sequence of commands:
in main repo:
<do something>
hg qnew -f newpatch.patch
cd .hg/patches
hg commit -m"blah"
(failed for some reason, don't ask)
hg qnew anotherpatch.patch
Apparently, hg qnew silently creates a new patch queue. This might be
convenient, but I'd argue that it is better to fail if it doesn't find a
patch queue, and require hg qinit.
/Roman
Am Donnerstag, den 31.07.2008, 12:52 +0200 schrieb Peer Sommerlund:
>
>
> 2008/7/31 Roman Kennke <roman.kennke at aicas.com>
> Hi,
>
>
> > 2008/7/31 Roman Kennke <roman.kennke at aicas.com>
> > A coworker of mine ran into this error while trying
> to commit
> > a new
> > patch to a patch queue repository:
> >
> > > hg commit
> > abort: cannot commit over an applied mq patch
> >
> > Are you sure it is not "hg qrefresh" or "hg qnew --force"
> you want
> > instead?
>
>
> Yes. This commit is supposed to be in the .hg/patches
> repository. This
> is why I am confused.
>
> The warning is when you try to commit in your main repository while
> you have qpush'ed some patches.
>
> If you want to commit the state of your patch queue to your patch
> queue repository,
> use hg qcommit
>
>
> > .. maybe followed by "hg qcommit"
>
>
> Is this the same as (cd .hg/patches ; hg commit ) ?
>
> Yes
>
>
>
--
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com * Tel: +49-721-663 968-48
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt
More information about the Mercurial
mailing list