git-hg plugin, problems with the patch.

[Uwe Brauer]

Hi

I am in a state of desperation 

As I described yesterday I clone a git repo to my machine either
directly via git or via hg. I then generate a bookmark which I use to
prepare a patch. I do not merge nor do I rebase. I hope this is ok?

So the beginning of hg log -G looks like

o  changeset:   6851:7a326e5bfa12
|  bookmark:    pretty
|  tag:         tip
|  parent:      6847:c54ae6c3004a
|  user:        Uwe Brauer <oub at mat.ucm.es>
|  date:        Thu Sep 15 15:07:10 2016 +0000
|  summary:     auctex.texi: Modify text for WYSIWYG paragraph, shorten reference to x-symbol. Compare prettification and preview-latex.
|
| @  changeset:   6850:f2ee83e9c9f8
| |  bookmark:    master
| |  user:        Stefan Monnier <monnier at iro.umontreal.ca>
| |  date:        Mon Sep 12 21:04:52 2016 -0400
| |  summary:     Cherry-pick 9c24759a96f41e288841ec2e815d62d58dc01e7a from elpa branch
| |
| o  changeset:   6849:eded48a563e7
| |  user:        Arash Esbati <arash.esbati at gmail.com>
| |  date:        Wed Sep 14 13:35:07 2016 +0200
| |  summary:     ; Turn mandatory argument to optional
| |
| o  changeset:   6848:8a7f14492f77
| |  parent:      6843:73ba0ee18b56
| |  user:        Arash Esbati <arash.esbati at gmail.com>
| |  date:        Mon Sep 12 15:28:41 2016 +0200
| |  summary:     ; Fix a typo
| |
o |  changeset:   6847:c54ae6c3004a
| |  user:        Uwe Brauer <oub at mat.ucm.es>
| |  date:        Sun Sep 11 16:05:51 2016 +0000
| |  summary:     * auctex.texi (Semi--WYSIWYG): Add new section
| |
o |  changeset:   6846:19350016f7cd
|/   parent:      6843:73ba0ee18b56
|    user:        Uwe Brauer <oub at mat.ucm.es>
|    date:        Fri Sep 09 11:34:43 2016 +0000
|    summary:     doc/auctex.texi: modify inf about prettifying at inf about font-latex-fontify-script
|
| o  changeset:   6845:2c411b63f685
|/   bookmark:    bidi
|    parent:      6843:73ba0ee18b56
|    user:        Uwe Brauer <oub at mat.ucm.es>
|    date:        Fri Sep 09 09:02:43 2016 +0000
|    summary:     Add style/bidi.el and relevant entry in Makefile.in
|
| o  changeset:   6844:7f32ca640520
|/   bookmark:    exam
|    user:        Uwe Brauer <oub at mat.ucm.es>
|    date:        Fri Sep 09 09:00:43 2016 +0000
|    summary:     Add style/exam.el and relevant entry in Makefile.in
|
o  changeset:   6843:73ba0ee18b56
|  user:        Arash Esbati <arash.esbati at gmail.com>
|  date:        Fri Sep 09 08:19:28 2016 +0200
|  summary:     ; Query for second mandatory argument.
|

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


Something in my approach is fundamentally flawed, why the heck to I have
a new head in 6848? How can I repair that repo to work again with the
git one. Or shall I proceed as in https://xkcd.com/1597

Uwe Brauer