hg-git plugin patches: problems whitespace

Uwe Brauer oub at mat.ucm.es
Wed Sep 14 21:37:06 UTC 2016


hi

I am again not sure whether this specific question is appropriate for
the list, if not I apologize. Here is what I did: using the hg-git
plugin

hg clone git://git.savannah.gnu.org/auctex.git  auctex-hg1
hg clone git://git.savannah.gnu.org/auctex.git  auctex-hg2

Cd auctex-hg1, edit change commit, export

 hg export -r 6000 mypatch.patch

Import the patch in auctex-hg2 without any difficulties

Then I run

hg clone git://git.savannah.gnu.org/auctex.git  auctex-git

And tried to import the patch with
git am --patch-format=hg mypatch.patch

2 problems:

    - I was asked for my user name and email address, although these are
      specified in my hgrc file, so that seems a git specific error
      which cannot be helped,

    - but the next warning/error message looked more serious
      /home/oub/emacs/site-lisp/packages/src/Git/auctex-git/.git/rebase-apply/patch:9:
      trailing whitespace. warning: 2 lines add whitespace errors.

Is git more picky? Is this harmful, how could I have avoided that
warning? Hg did not complain.

Uwe Brauer 


 


More information about the Mercurial mailing list