Totally stuck (mq)

[Neal Becker]

On Friday 18 April 2008, Patrick Mézard wrote:
> Neal Becker a écrit :
> > 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
>
> What does "hg parents" say ? Do you have local changes (as returned by "hg
> status") ?
>
> --
> Patrick Mézard

 hg parents
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

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

hg status -m 
(shows all the changes I pulled from the master repo for sync - lots of them)

AFAICT, I can fix this by doing qrefresh, but IIUC this will make all those 
sync changes part of my latest mq patch which I don't want.