abort: queue top not at same revision as working directory

[Dustin Sallings]

   You could update to qbase (qparent? one of those), qpop -a, update  
again, and then qpush

   In general, you probably want to qpop -a before doing anything else  
with the repo.

-- 
Dustin Sallings (mobile)

On Oct 5, 2007, at 7:53, Marcin Kasperski <Marcin.Kasperski at softax.com.pl 
 > wrote:

>
> Well, when I try hg qpush or hg qpop, I get the following error  
> message:
>
>  abort: queue top not at same revision as working directory
>
> What happened? Well, I had some hg repo with mq enabled (and itself
> versioned, qinit -c). Developed some patches there.
>
> Then I cloned this repo and patches repo to some other machine,
> developed something there and commited.
>
> Then I pulled both repo and patches repo to the original machine and
> updated.
>
> And since then I get this message.
>
> I suspect that maybe it has sth to do with the fact that I did not
> qpop before pulling main repo. Am I right?
>
>
> BTW: what is the 'official' way of working in such situation - when
> patches repo is cloned? Is it necessary to qpop on both sides before
> pull?
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>