queue top not at dirstate parents

[Ali Saidi]

You can strip off the offending revisions and delete the contents of  
the status file. That should get you back to a place where you can  
use mq happily again.

Take a look at the revision history with hg log, find the first  
revision that in one of your patches (it might still be qbase, I  
can't remember) and then hg strip <rev>. After that remember to 0 the  
status file and you should be back on your way.

Ali

On Sep 6, 2007, at 12:26 PM, Dustin Sallings wrote:

>
>   Oh, right. I meant qtip when I said qparent.  Glad that didn't  
> cause endless confusion.
>
>   I think I may have failed to reproduce the issue because I am  
> running a much newer version of hg.  In 0.9.4, it wouldn't allow me  
> to perform some of these operations with patches applied.
>
>   Generally, though, where I do use mq the most, I have a pull  
> script that basically does this:
>
> hg incoming && hg qpop -a && hg pull -u && hg qpush -a
>
>   It's slightly more complicated, but that's the important part.   
> Note that incoming's exit code did not indicate the presence of  
> patches before 0.9.4.
>
> -- 
> Dustin mobile.
>
> -----Original Message-----
> From: "David Montgomery" <davidlmontgomery at gmail.com>
>
> Date: Thu, 6 Sep 2007 00:41:30
> To:"Dustin Sallings" <dustin at spy.net>
> Cc:mercurial at selenic.com
> Subject: Re: queue top not at dirstate parents
>
>
>> What version of mercurial is this?  I'm having trouble reproducing
>> this state.  Have you tried updated to qparent before popping?
>
> This is version 0.9.1
>
> Thanks for the suggestion, Dustin.  That's what I did, I think.
> I updated to the revision given as the queue top, and then was
> able to qpop.
>
> The key intuitive thing that I was missing before was that the
> mq patches are not part of the repository -- or at least not in
> the same way.  They're local to that repository, but not published
> by it.  I was expecting them to show up in other repos after
> pushing, pulling, updating.
>
> (Certainly hgbook's Chapter 12 indicates this.  It just didn't
> sink in for me until I started playing around.)
>
> David
>
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>