Show More
@@ -91,7 +91,7 b' testfilters = [' | |||
|
91 | 91 | uprefix = r"^ \$ " |
|
92 | 92 | utestpats = [ |
|
93 | 93 | [ |
|
94 |
(r'^(\S.*|| |
|
|
94 | (r'^(\S.*|| [$>] .*)[ \t]\n', "trailing whitespace on non-output"), | |
|
95 | 95 | (uprefix + r'.*\|\s*sed[^|>\n]*\n', |
|
96 | 96 | "use regex test output patterns instead of sed"), |
|
97 | 97 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), |
@@ -279,10 +279,10 b' Test annotate with whitespace options' | |||
|
279 | 279 | > EOF |
|
280 | 280 | $ hg ci -Am "adda" |
|
281 | 281 | adding a |
|
282 |
$ |
|
|
282 | $ sed 's/EOL$//g' > a <<EOF | |
|
283 | 283 | > a a |
|
284 | 284 | > |
|
285 | > | |
|
285 | > EOL | |
|
286 | 286 | > b b |
|
287 | 287 | > EOF |
|
288 | 288 | $ hg ci -m "changea" |
@@ -322,12 +322,12 b' Multiple binary files:' | |||
|
322 | 322 | |
|
323 | 323 | Filenames with spaces: |
|
324 | 324 | |
|
325 |
$ hg import -d "1000000 0" -m spaces - |
|
|
325 | $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - | |
|
326 | 326 | > diff --git a/foo bar b/foo bar |
|
327 | 327 | > new file mode 100644 |
|
328 | 328 | > index 0000000..257cc56 |
|
329 | 329 | > --- /dev/null |
|
330 | > +++ b/foo bar | |
|
330 | > +++ b/foo bar EOL | |
|
331 | 331 | > @@ -0,0 +1 @@ |
|
332 | 332 | > +foo |
|
333 | 333 | > EOF |
General Comments 0
You need to be logged in to leave comments.
Login now