Totally stuck (mq)

[Patrick Mézard]

Neal Becker a écrit :
> On Friday 18 April 2008, Patrick Mézard wrote:
>> Neal Becker a écrit :
>>> I have a repo using mq.
> 
>  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.

I did not understand you had a merge. Do you care about the local changes ? Probably not if they come from the merge operation. If not, "hg update -C qtip" and you should be able to work with you queue again.

--
Patrick Mézard