Mercurial > public > mercurial-scm > hg-stable

diff tests/test-import-git.t @ 17347:2da47de36b6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix check for trailing whitespace on continued lines too The tests in test-annotate.t and test-import-git.t that relied on trailing space in a file created by a here string is now masked by a literal 'EOL' string that is removed.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 08 Aug 2012 18:10:37 +0200
parents 4f8054d3171b
children 9f1d4323c749
line wrap: on
line diff
--- a/tests/test-import-git.t	Wed Aug 08 18:10:30 2012 +0200
+++ b/tests/test-import-git.t	Wed Aug 08 18:10:37 2012 +0200
@@ -322,12 +322,12 @@
 
 Filenames with spaces:
 
-  $ hg import -d "1000000 0" -m spaces - <<EOF
+  $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces -
   > diff --git a/foo bar b/foo bar
   > new file mode 100644
   > index 0000000..257cc56
   > --- /dev/null
-  > +++ b/foo bar	
+  > +++ b/foo bar	EOL
   > @@ -0,0 +1 @@
   > +foo
   > EOF