Mercurial > hg
annotate tests/test-flags @ 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 | 5b7da468531b |
children |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh -e |
412 | 2 |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
440
diff
changeset
|
3 umask 027 |
412 | 4 mkdir test1 |
5 cd test1 | |
6 | |
7 hg init | |
8 touch a b | |
9 hg add a b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
10 hg ci -m "added a b" -d "1000000 0" |
412 | 11 |
12 cd .. | |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
13 hg clone test1 test3 |
412 | 14 mkdir test2 |
15 cd test2 | |
16 | |
17 hg init | |
440 | 18 hg pull ../test1 |
412 | 19 hg co |
20 chmod +x a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
21 hg ci -m "chmod +x a" -d "1000000 0" |
4530
0ac7fee4f024
Make sure the changelog mentions files whose flags changed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3853
diff
changeset
|
22 echo % the changelog should mention file a: |
8523
5b7da468531b
tests: replace #...# syntax with {...}
Martin Geisler <mg@lazybytes.net>
parents:
4530
diff
changeset
|
23 hg tip --template '{files}\n' |
412 | 24 |
25 cd ../test1 | |
26 echo 123 >>a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
27 hg ci -m "a updated" -d "1000000 0" |
412 | 28 |
440 | 29 hg pull ../test2 |
412 | 30 hg heads |
31 hg history | |
32 | |
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
33 hg -v merge |
412 | 34 |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
35 cd ../test3 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
36 echo 123 >>b |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
37 hg ci -m "b updated" -d "1000000 0" |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
38 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
39 hg pull ../test2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
40 hg heads |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
41 hg history |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
42 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
43 hg -v merge |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
44 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
45 ls -l ../test[123]/a > foo |
1923
7d83a351a936
fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
46 cut -b 1-10 < foo |
412 | 47 |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3321
diff
changeset
|
48 hg debugindex .hg/store/data/a.i |
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3321
diff
changeset
|
49 hg debugindex ../test2/.hg/store/data/a.i |
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3321
diff
changeset
|
50 hg debugindex ../test1/.hg/store/data/a.i |