git-hg plugin, problems with the patch.
Uwe Brauer
oub at mat.ucm.es
Fri Sep 16 10:01:35 UTC 2016
>>> "Kevin" == Kevin Bullock <kbullock at ringworld.org> writes:
>> 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.
Thanks, you are right, but it did not help.
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
order
More information about the Mercurial
mailing list