> On Sep 16, 2016, at 09:56, Uwe Brauer <o...@mat.ucm.es> wrote:
> 
>> 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?

Precisely the reverse: in your newer clone, update to the revision that you 
originally based your work on (from the archives that appears to be 
73ba0ee18b56), and import your patch on top of that. Note that this is only to 
prove to yourself that `hg import` is not broken.

If you can't apply cleanly against a newer upstream revision, it means that 
upstream changed the same file in an overlapping way. That means you'll have to 
adjust your changes. There are many ways to do this, but I'd recommend you pull 
from upstream and rebase your branch within your original local clone. You will 
probably have conflicts that you'll have to resolve manually and then continue 
the rebase.

At this point I'd highly recommend finding a local Mercurial expert who can 
help you out, rather than these slow and unreliable mailing list round-trips. 
You'll be able to sort out your remaining issues much quicker with someone 
in-person.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

_______________________________________________
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial

Reply via email to