Totally stuck (mq)

[Neal Becker]

I have a repo using mq.

I did a pull -u to sync from master repo.  Now I'm totally stuck.

hg head
changeset:   28:a4717a0feddf
tag:         tip
parent:      20:9f6cef935a87
user:        ndbecker2 at gmail.com
date:        Fri Apr 18 08:14:59 2008 -0400
summary:     sync

changeset:   27:1349d2519c05
tag:         boost.ublas.improved_type_deduction.patch
tag:         qtip
user:        ndbecker2 at gmail.com
date:        Tue Aug 28 11:22:43 2007 -0400
summary:     improved returntype deduction in ublas

I don't want to commit the 'sync' to the current mq patch, that would screw
up my patch.

hg qpop -a
abort: local changes found, refresh first

I don't want to qrefresh, that would put the changes I pulled in via sync to
the current mq patch, right?

 hg ci -m 'sync'
abort: cannot commit over an applied mq patch

I tried everthing I can think of, but basically I can't go forward and I
can't go backward.