git-hg plugin, problems with the patch.

[Kevin Bullock]

> On Sep 15, 2016, at 10:52, Uwe Brauer <oub at mat.ucm.es> wrote:
> 
[...]
> So I try
> hg export -g -r 6851 -o ../pretty-not-merged.patch
> 
> But when I try to import that patch into git
> git am --patch-format=hg pretty-not-merged.patch
> 
> I obtain
> 
> error: patch failed: doc/auctex.texi:165
> error: doc/auctex.texi: patch does not apply

I think you'll have a hard time applying your later changes (6851:7a326e5bfa12) without your earlier ones to the same file (6846:19350016f7cd and 6847:c54ae6c3004a). Your `hg export` command only exported the last commit in your branch. I don't see anything fundamentally wrong with your graph.

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