--- a/tests/test-import-bypass.t Mon Feb 13 16:47:31 2012 +0100
+++ b/tests/test-import-bypass.t Mon Feb 13 17:22:35 2012 +0100
@@ -111,7 +111,15 @@
Test commit editor
- $ hg diff -c 1 > ../test.diff
+ $ cat > ../test.diff <<EOF
+ > diff -r 07f494440405 -r 4e322f7ce8e3 a
+ > --- a/a Thu Jan 01 00:00:00 1970 +0000
+ > +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ > @@ -1,1 +1,2 @@
+ > -a
+ > +b
+ > +c
+ > EOF
$ HGEDITOR=cat hg import --bypass ../test.diff
applying ../test.diff
@@ -138,7 +146,7 @@
$ hg --config patch.eol=auto import -d '0 0' -m 'test patch.eol' --bypass ../test.diff
applying ../test.diff
$ shortlog
- o 3:d7805b4d2cb3 test 0 0 - default - test patch.eol
+ o 3:c606edafba99 test 0 0 - default - test patch.eol
|
@ 2:872023de769d test 0 0 - default - makeacrlf
|