Mercurial > hg
comparison tests/test-import-git.t @ 17347:2da47de36b6f
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 |
comparison
equal
deleted
inserted
replaced
| 17346:2944a6d35158 | 17347:2da47de36b6f |
|---|---|
| 320 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 | 320 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
| 321 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 | 321 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
| 322 | 322 |
| 323 Filenames with spaces: | 323 Filenames with spaces: |
| 324 | 324 |
| 325 $ hg import -d "1000000 0" -m spaces - <<EOF | 325 $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - |
| 326 > diff --git a/foo bar b/foo bar | 326 > diff --git a/foo bar b/foo bar |
| 327 > new file mode 100644 | 327 > new file mode 100644 |
| 328 > index 0000000..257cc56 | 328 > index 0000000..257cc56 |
| 329 > --- /dev/null | 329 > --- /dev/null |
| 330 > +++ b/foo bar | 330 > +++ b/foo bar EOL |
| 331 > @@ -0,0 +1 @@ | 331 > @@ -0,0 +1 @@ |
| 332 > +foo | 332 > +foo |
| 333 > EOF | 333 > EOF |
| 334 applying patch from stdin | 334 applying patch from stdin |
| 335 | 335 |