abort: queue top not at same revision as working directory

[Matt Mackall]

On Tue, Oct 09, 2007 at 03:56:45PM +0200, Marcin Kasperski wrote:
> Dustin Sallings <dustin at spy.net> writes:
> 
> >    You could update to qbase (qparent? one of those), qpop -a, update  
> > again, and then qpush
> 
> $ hg up -r qbase
> 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
> 
> $ hg qpop -a
> abort: queue top not at same revision as working directory

Slow down, folks, and read the error messages. What do they mean? The
queue top is the patch that was last pushed onto the repo, in other
words, the one that would be popped.

$ hg qpop
abort: queue top not at same revision as working directory

Ok, somehow my working directory is at a different changeset than the
last mq changeset I was working on. I must have checked out something
else (probably something I pulled). What IS my working directory
revision?

$ hg parents
changeset:   5433:ba323d877d07
tag:         tip
parent:      5431:a7c832abd29c
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Oct 09 11:55:42 2007 -0500
summary:     stupid change

Indeed, that's not an mq change. More briefly, we can do:

$ hg id
ba323d877d07 tip

Let's figure out where my mq changesets are:

$ hg heads
changeset:   5433:ba323d877d07
tag:         tip
parent:      5431:a7c832abd29c
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Oct 09 11:55:42 2007 -0500
summary:     stupid change

changeset:   5432:7beebca83251
tag:         qtip
tag:         qbase
tag:         bleah
user:        Matt Mackall <mpm at selenic.com>
date:        Tue Oct 09 11:54:01 2007 -0500
summary:     [mq]: bleah

Because mq won't let you commit on top of an mq changeset, the queue
top will always be a head. Further, as you can see here, it'll always
have a "qtip" tag. So:

$ hg co -C qtip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

$ hg qpop
saving bundle to
/home/mpm/hg/.hg/strip-backup/7beebca83251-temp
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
Patch queue now empty

(This extra noise is mq bundling up the other branch so it can pop your
changeset, then unbundling it again. It usually doesn't need to do
this, because mq changesets are usually at the tip.)

-- 
Mathematics is the supreme nostalgia of our time.