> On Sep 16, 2016, at 05:01, Uwe Brauer <o...@mat.ucm.es> wrote:
> 
> Here is what I done.
> Since I am not sure whether the git-hg plugin was the culprit
> I cloned the auctex repo again via hg clone, 
> 
> hg clone git://git.savannah.gnu.org/auctex.git auctex-hg
> 
> Then I run in my local repo
> 
> hg export -r 6847::6851 -o mypatch.patch
> 
> 
> And in the recently cloned auctex-hg repo
> 
> I run
> 
> hg import mypatch.patch
> 
> applying mypatch.patch
> patching file doc/auctex.texi
> Hunk #1 FAILED at 163
> Hunk #3 FAILED at 2594
> Hunk #4 FAILED at 2622
> 3 out of 4 hunks FAILED -- saving rejects to file doc/auctex.texi.rej
> abort: patch failed to apply
> 
> So something is wrong here very wrong

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.

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