[Tests on Windows] test-convert-git.t

Eduard-Cristian Stefan alexandrul.ct at gmail.com
Thu Jun 7 21:16:27 CDT 2012


This test has two issues when run with Git 1.7.10:

+  warning: LF will be replaced by CRLF in d/b.
+  The file will have its original line endings in your working directory.

can be solved with:

@@ -1,5 +1,7 @@
  
    $ "$TESTDIR/hghave" git || exit 80
+  $ echo "[core]" >> $HOME/.gitconfig
+  $ echo "autocrlf = false" >> $HOME/.gitconfig
    $ echo "[extensions]" >> $HGRCPATH
    $ echo "convert=" >> $HGRCPATH
    $ echo 'hgext.graphlog =' >> $HGRCPATH

and the second one is:

    $ commit -m 'Merge branch other'
+  fatal: cannot do a partial commit during a merge.

Changing the commit command to:

     $ commit -i -m 'Merge branch other'

leads to a different commit message:
'Merge' instead of 'Merge branch other'

Any ideas? Can someone test this with an older Git?

Eduard


More information about the Mercurial-devel mailing list