##// END OF EJS Templates
test-extdiff: fix 5c0e1222e7c0 temporary dir output
Patrick Mezard -
r13762:3740792d default
parent child Browse files
Show More
@@ -57,7 +57,7 b' Should diff cloned directories:'
57 Should diff cloned files directly:
57 Should diff cloned files directly:
58
58
59 $ hg falabala -r 0:1
59 $ hg falabala -r 0:1
60 diffing a.8a5febb7f867/a a.34eed99112ab/a
60 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
61 [1]
61 [1]
62
62
63 Test diff during merge:
63 Test diff during merge:
@@ -75,7 +75,7 b' Test diff during merge:'
75 Should diff cloned file against wc file:
75 Should diff cloned file against wc file:
76
76
77 $ hg falabala
77 $ hg falabala
78 diffing a.2a13a4d2da36/a $TESTTMP/a/a
78 diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob)
79 [1]
79 [1]
80
80
81
81
@@ -83,13 +83,13 b' Test --change option:'
83
83
84 $ hg ci -d '2 0' -mtest3
84 $ hg ci -d '2 0' -mtest3
85 $ hg falabala -c 1
85 $ hg falabala -c 1
86 diffing a.8a5febb7f867/a a.34eed99112ab/a
86 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
87 [1]
87 [1]
88
88
89 Check diff are made from the first parent:
89 Check diff are made from the first parent:
90
90
91 $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code"
91 $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code"
92 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a
92 diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob)
93 diff-like tools yield a non-zero exit code
93 diff-like tools yield a non-zero exit code
94
94
95 Test extdiff of multiple files in tmp dir:
95 Test extdiff of multiple files in tmp dir:
@@ -161,19 +161,19 b' Diff in working directory, after:'
161 Test extdiff with --option:
161 Test extdiff with --option:
162
162
163 $ hg extdiff -p echo -o this -c 1
163 $ hg extdiff -p echo -o this -c 1
164 this a.8a5febb7f867/a a.34eed99112ab/a
164 this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
165 [1]
165 [1]
166
166
167 $ hg falabala -o this -c 1
167 $ hg falabala -o this -c 1
168 diffing this a.8a5febb7f867/a a.34eed99112ab/a
168 diffing this */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
169 [1]
169 [1]
170
170
171 Test with revsets:
171 Test with revsets:
172
172
173 $ hg extdif -p echo -c "rev(1)"
173 $ hg extdif -p echo -c "rev(1)"
174 a.8a5febb7f867/a a.34eed99112ab/a
174 */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
175 [1]
175 [1]
176
176
177 $ hg extdif -p echo -r "0::1"
177 $ hg extdif -p echo -r "0::1"
178 a.8a5febb7f867/a a.34eed99112ab/a
178 */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob)
179 [1]
179 [1]
General Comments 0
You need to be logged in to leave comments. Login now