Totally stuck (mq)

[Benoît Allard]

Andrei Vermel wrote:
>> And then?
> Also, there was a handy qrebase extension by Gilles Moris posted in the mail
> list some time ago. It works quite well for me.
> In your case it would be enough to just do 'hg qrebase' after the pull. 
> In future make sure you do not pull with '-u' when you have patches applied.

IMHO, pull (in combinations with "-u") should check that there are any 
patch applied and die if so ...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4197 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial/attachments/20080418/a5014788/attachment.bin