> 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.