Mercurial > hg
comparison tests/test-extdiff @ 5143:d4fa6bafc43a
Remove trailing spaces, fix indentation
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 07 Aug 2007 10:28:43 +0200 |
| parents | 2be225ea5722 |
| children | e81e6c996e99 |
comparison
equal
deleted
inserted
replaced
| 5142:2ffe3e2a1ac2 | 5143:d4fa6bafc43a |
|---|---|
| 22 hg ci -d '0 0' -mtest1 | 22 hg ci -d '0 0' -mtest1 |
| 23 | 23 |
| 24 echo b >> a | 24 echo b >> a |
| 25 hg ci -d '1 0' -mtest2 | 25 hg ci -d '1 0' -mtest2 |
| 26 | 26 |
| 27 # should diff cloned files directly | 27 # should diff cloned files directly |
| 28 hg falabala -r 0:1 | 28 hg falabala -r 0:1 |
| 29 | 29 |
| 30 # test diff during merge | 30 # test diff during merge |
| 31 hg update 0 | 31 hg update 0 |
| 32 echo c >> c | 32 echo c >> c |
| 33 hg add c | 33 hg add c |
| 34 hg ci -m "new branch" -d '1 0' | 34 hg ci -m "new branch" -d '1 0' |
| 35 hg update -C 1 | 35 hg update -C 1 |
| 36 hg merge tip | 36 hg merge tip |
| 37 # should diff cloned file against wc file | 37 # should diff cloned file against wc file |
| 38 hg falabala > out || echo "diff-like tools yield a non-zero exit code" | 38 hg falabala > out || echo "diff-like tools yield a non-zero exit code" |
| 39 # cleanup the output since the wc is a tmp directory | 39 # cleanup the output since the wc is a tmp directory |
| 40 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out | 40 sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out |