# HG changeset patch # User Eduard-Cristian Stefan # Date 2012-06-08 02:31:28 # Node ID cfd892b7569f9abe6b202a55fb5c869811029444 # Parent b0e8afdfa97032aba6ef96de53d856a1901a0c2c test-convert: disable autocrlf for git Git might have autocrlf=true as a global or default setting, especially on windows. That is not expected in the tests and can cause + warning: LF will be replaced by CRLF in d/b. + The file will have its original line endings in your working directory. Explicitly setting it false will make the test pass in some setups - but still not out of the box. diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t --- a/tests/test-convert-git.t +++ b/tests/test-convert-git.t @@ -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 diff --git a/tests/test-convert-tagsbranch-topology.t b/tests/test-convert-tagsbranch-topology.t --- a/tests/test-convert-tagsbranch-topology.t +++ b/tests/test-convert-tagsbranch-topology.t @@ -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