> Presumably that file changed upstream in a way that your patch
   > overlaps. You can prove this to yourself by applying your patch on top
   > of the same upstream revision it was initially based on.

Thanks, but not sure I understand this. Let me denote my local repo I
work on: auctex-hg.

And the actual one I recently cloned via
hg clone

I denote auctex-bridge.

I generated the patch using this repo auctex-hg. I cannot apply it to
auctex-bridge, so what do you want me to do?

 hg pull (in auctex-hg)

and then import my patch?

Mercurial mailing list

Reply via email to