MercurialQueues patch merging broken?

[Giorgos Keramidas]

With a recent crew build, I see the following when trying to rebase an
MQ patch queue:

keramida at kobe:/home/keramida/hg/doc/gker$ hg qpush -a
applying handbook-el
applying jails-article
applying jails-fixups
applying kokkalis
Now at: kokkalis
keramida at kobe:/home/keramida/hg/doc/gker$ hg qsave -e -c
copy /home/keramida/hg/doc/gker/.hg/patches to /home/keramida/hg/doc/gker/.hg/patches.1
keramida at kobe:/home/keramida/hg/doc/gker$ hg pull
pulling from /home/keramida/hg/doc/ncvs
searching for changes
adding changesets
adding manifests
adding file changes
added 8 changesets with 8 changes to 7 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
keramida at kobe:/home/keramida/hg/doc/gker$ hg up -C tip
9 files updated, 0 files merged, 9 files removed, 0 files unresolved
keramida at kobe:/home/keramida/hg/doc/gker$ hg qpush -a -m
merging with queue at: /home/keramida/hg/doc/gker/.hg/patches.1
applying handbook-el
applying jails-article
applying jails-fixups
applying kokkalis
Now at: kokkalis
keramida at kobe:/home/keramida/hg/doc/gker$ hg qpop -a
abort: queue top not at same revision as working directory
keramida at kobe:/home/keramida/hg/doc/gker$ 

This seems to have been broken recently, as I have used the same
sequence of steps to rebase MQ patchsets several times in the past,
without this sort of error :-(