Mercurial > hg
changeset 13762:3740792dbe51
test-extdiff: fix 5c0e1222e7c0 temporary dir output
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 25 Mar 2011 16:46:19 +0100 |
| parents | aeb41f0048e7 |
| children | 7a73c406c0fd |
| files | tests/test-extdiff.t |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-extdiff.t Fri Mar 25 10:13:46 2011 -0400 +++ b/tests/test-extdiff.t Fri Mar 25 16:46:19 2011 +0100 @@ -57,7 +57,7 @@ Should diff cloned files directly: $ hg falabala -r 0:1 - diffing a.8a5febb7f867/a a.34eed99112ab/a + diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] Test diff during merge: @@ -75,7 +75,7 @@ Should diff cloned file against wc file: $ hg falabala - diffing a.2a13a4d2da36/a $TESTTMP/a/a + diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) [1] @@ -83,13 +83,13 @@ $ hg ci -d '2 0' -mtest3 $ hg falabala -c 1 - diffing a.8a5febb7f867/a a.34eed99112ab/a + diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] Check diff are made from the first parent: $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" - diffing a.2a13a4d2da36/a a.46c0e4daeb72/a + diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) diff-like tools yield a non-zero exit code Test extdiff of multiple files in tmp dir: @@ -161,19 +161,19 @@ Test extdiff with --option: $ hg extdiff -p echo -o this -c 1 - this a.8a5febb7f867/a a.34eed99112ab/a + this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] $ hg falabala -o this -c 1 - diffing this a.8a5febb7f867/a a.34eed99112ab/a + diffing this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] Test with revsets: $ hg extdif -p echo -c "rev(1)" - a.8a5febb7f867/a a.34eed99112ab/a + */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1] $ hg extdif -p echo -r "0::1" - a.8a5febb7f867/a a.34eed99112ab/a + */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) [1]