qpop abort: queue top not at same revision as working directory
Thomas Arendsen Hein
thomas at intevation.de
Wed Mar 21 07:46:58 UTC 2007
* Neal Becker <ndbecker2 at gmail.com> [20070320 13:21]:
> hg qpop
> abort: queue top not at same revision as working directory
>
> What does this mean? How do I fix it?
You manually added or removed changesets or updated to a different
changeset while mq patches were applied.
Check with 'hg tip' and 'hg parents', both should be identical when
using mq, but probably they are currently not for you.
hg tip should start like this:
changeset: REV:SHORTHASH
tag: qtip
tag: tip
tag: PATCHNAME
If yes, use 'hg status' to check if you have modified things you
might want to keep, and otherwise 'hg update' to tip.
If above doesn't work, look at the last line of .hg/patches/status,
which looks like LONGHASH:PATCHNAME, check if you still have this
changeset in your repository and if there are later changesets with
'hg log -r LONGHASH:' (don't forget the colon, but you can
abbreviate LONGHASH if you like). If you'll get more than one
changeset, check if they are children of your mq changesets:
If yes, you're (recoverable) trouble, please ask again.
If no, they're probably just pulled from somewhere else, e.g.
upstream. Just update to LONGHASH, qpop your queue, update to new
tip, qpush.
Thomas
--
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Osnabrück - Registereintrag: Amtsgericht Osnabrück, HR B 18998
Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
More information about the Mercurial
mailing list