Mercurial > hg
annotate tests/test-empty-dir @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 33b6c8193652 |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
578 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 echo 123 > a | |
5 hg add a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
6 hg commit -m "first" -d "1000000 0" a |
578 | 7 mkdir sub |
8 echo 321 > sub/b | |
9 hg add sub/b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
10 hg commit -m "second" -d "1000000 0" sub/b |
578 | 11 cat sub/b |
12 hg co 0 | |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
13 cat sub/b 2>/dev/null || echo "sub/b not present" |
3469
33b6c8193652
Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3428
diff
changeset
|
14 test -d sub || echo "sub not present" |
578 | 15 |
16 true |