Show More
@@ -7,7 +7,7 b' Invalid syntax: no value' | |||
|
7 | 7 | > novaluekey |
|
8 | 8 | > EOF |
|
9 | 9 | $ hg showconfig |
|
10 | hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey | |
|
10 | hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey (glob) | |
|
11 | 11 | [255] |
|
12 | 12 | |
|
13 | 13 | Invalid syntax: no key |
@@ -16,7 +16,7 b' Invalid syntax: no key' | |||
|
16 | 16 | > =nokeyvalue |
|
17 | 17 | > EOF |
|
18 | 18 | $ hg showconfig |
|
19 | hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue | |
|
19 | hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue (glob) | |
|
20 | 20 | [255] |
|
21 | 21 | |
|
22 | 22 | Test hint about invalid syntax from leading white space |
@@ -25,7 +25,7 b' Test hint about invalid syntax from lead' | |||
|
25 | 25 | > key=value |
|
26 | 26 | > EOF |
|
27 | 27 | $ hg showconfig |
|
28 | hg: parse error at $TESTTMP/.hg/hgrc:1: key=value | |
|
28 | hg: parse error at $TESTTMP/.hg/hgrc:1: key=value (glob) | |
|
29 | 29 | unexpected leading whitespace |
|
30 | 30 | [255] |
|
31 | 31 | |
@@ -34,7 +34,7 b' Test hint about invalid syntax from lead' | |||
|
34 | 34 | > key=value |
|
35 | 35 | > EOF |
|
36 | 36 | $ hg showconfig |
|
37 | hg: parse error at $TESTTMP/.hg/hgrc:1: [section] | |
|
37 | hg: parse error at $TESTTMP/.hg/hgrc:1: [section] (glob) | |
|
38 | 38 | unexpected leading whitespace |
|
39 | 39 | [255] |
|
40 | 40 |
@@ -482,7 +482,7 b' check messages when there are files to u' | |||
|
482 | 482 | b |
|
483 | 483 | |
|
484 | 484 | $ hg -R clone2 outgoing --large --graph --template "{rev}" |
|
485 | comparing with $TESTTMP/issue3651/src | |
|
485 | comparing with $TESTTMP/issue3651/src (glob) | |
|
486 | 486 | searching for changes |
|
487 | 487 | @ 1 |
|
488 | 488 |
@@ -1787,7 +1787,7 b' Cat a standin' | |||
|
1787 | 1787 | $ hg cat .hglf/sub/large4 |
|
1788 | 1788 | e166e74c7303192238d60af5a9c4ce9bef0b7928 |
|
1789 | 1789 | $ hg cat .hglf/normal3 |
|
1790 | .hglf/normal3: no such file in rev 598410d3eb9a | |
|
1790 | .hglf/normal3: no such file in rev 598410d3eb9a (glob) | |
|
1791 | 1791 | [1] |
|
1792 | 1792 | |
|
1793 | 1793 | Test that renaming a largefile results in correct output for status |
@@ -96,10 +96,10 b' Issue294: hg remove --after dir fails wh' | |||
|
96 | 96 | |
|
97 | 97 | $ hg files |
|
98 | 98 | b |
|
99 | dir.h/foo | |
|
99 | dir.h/foo (glob) | |
|
100 | 100 | t.h |
|
101 | t/e.h | |
|
102 | t/x | |
|
101 | t/e.h (glob) | |
|
102 | t/x (glob) | |
|
103 | 103 | $ hg files b |
|
104 | 104 | b |
|
105 | 105 | |
@@ -130,11 +130,11 b' Issue294: hg remove --after dir fails wh' | |||
|
130 | 130 | ../t/e.h (glob) |
|
131 | 131 | |
|
132 | 132 | $ hg files |
|
133 | ../b | |
|
134 | ../dir.h/foo | |
|
135 | ../t.h | |
|
136 | ../t/e.h | |
|
137 | ../t/x | |
|
133 | ../b (glob) | |
|
134 | ../dir.h/foo (glob) | |
|
135 | ../t.h (glob) | |
|
136 | ../t/e.h (glob) | |
|
137 | ../t/x (glob) | |
|
138 | 138 | $ hg files . |
|
139 | 139 | [1] |
|
140 | 140 |
@@ -26,7 +26,7 b' The next call is expected to return noth' | |||
|
26 | 26 | |
|
27 | 27 | $ hg files -vr . |
|
28 | 28 | 2 a |
|
29 | 2 x b/a | |
|
29 | 2 x b/a (glob) | |
|
30 | 30 | 1 l l |
|
31 | 31 | $ hg files -r . -X b |
|
32 | 32 | a |
@@ -243,7 +243,7 b' qpop' | |||
|
243 | 243 | [255] |
|
244 | 244 | $ hg revert sub |
|
245 | 245 | reverting subrepo sub |
|
246 | adding sub/a | |
|
246 | adding sub/a (glob) | |
|
247 | 247 | $ hg qpop |
|
248 | 248 | popping 1.diff |
|
249 | 249 | now at: 0.diff |
@@ -262,7 +262,7 b' qpush' | |||
|
262 | 262 | [255] |
|
263 | 263 | $ hg revert sub |
|
264 | 264 | reverting subrepo sub |
|
265 | adding sub/a | |
|
265 | adding sub/a (glob) | |
|
266 | 266 | $ hg qpush |
|
267 | 267 | applying 1.diff |
|
268 | 268 | subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba) |
@@ -33,8 +33,8 b' failing test' | |||
|
33 | 33 | |
|
34 | 34 | $ $TESTDIR/run-tests.py --with-hg=`which hg` |
|
35 | 35 | |
|
36 |
--- $TESTTMP/test-failure.t |
|
|
37 |
+++ $TESTTMP/test-failure.t.err |
|
|
36 | --- $TESTTMP/test-failure.t | |
|
37 | +++ $TESTTMP/test-failure.t.err | |
|
38 | 38 | @@ -1,4 +1,4 @@ |
|
39 | 39 | $ echo babar |
|
40 | 40 | - rataxes |
@@ -87,8 +87,8 b' test for --retest' | |||
|
87 | 87 | |
|
88 | 88 | $ $TESTDIR/run-tests.py --with-hg=`which hg` --retest |
|
89 | 89 | |
|
90 |
--- $TESTTMP/test-failure.t |
|
|
91 |
+++ $TESTTMP/test-failure.t.err |
|
|
90 | --- $TESTTMP/test-failure.t | |
|
91 | +++ $TESTTMP/test-failure.t.err | |
|
92 | 92 | @@ -1,4 +1,4 @@ |
|
93 | 93 | $ echo babar |
|
94 | 94 | - rataxes |
@@ -121,8 +121,8 b' failed' | |||
|
121 | 121 | |
|
122 | 122 | $ $TESTDIR/run-tests.py --with-hg=`which hg` test-failure.t |
|
123 | 123 | |
|
124 |
--- $TESTTMP/test-failure.t |
|
|
125 |
+++ $TESTTMP/test-failure.t.err |
|
|
124 | --- $TESTTMP/test-failure.t | |
|
125 | +++ $TESTTMP/test-failure.t.err | |
|
126 | 126 | @@ -1,4 +1,4 @@ |
|
127 | 127 | $ echo babar |
|
128 | 128 | - rataxes |
@@ -274,7 +274,7 b' Refuse the fix' | |||
|
274 | 274 | Interactive with custom view |
|
275 | 275 | |
|
276 | 276 | $ echo 'n' | $TESTDIR/run-tests.py --with-hg=`which hg` -i --view echo |
|
277 | $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err | |
|
277 | $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) | |
|
278 | 278 | Accept this change? [n]* (glob) |
|
279 | 279 | ERROR: test-failure.t output changed |
|
280 | 280 | !. |
@@ -286,7 +286,7 b' Interactive with custom view' | |||
|
286 | 286 | View the fix |
|
287 | 287 | |
|
288 | 288 | $ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` --view echo |
|
289 | $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err | |
|
289 | $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) | |
|
290 | 290 | |
|
291 | 291 | ERROR: test-failure.t output changed |
|
292 | 292 | !. |
@@ -1324,7 +1324,7 b' configuration' | |||
|
1324 | 1324 | $ echo phasecheck4 >> t/t |
|
1325 | 1325 | $ hg commit -S -m phasecheck4 |
|
1326 | 1326 | committing subrepository s |
|
1327 | committing subrepository s/ss | |
|
1327 | committing subrepository s/ss (glob) | |
|
1328 | 1328 | warning: changes are committed in secret phase from subrepository ss |
|
1329 | 1329 | committing subrepository t |
|
1330 | 1330 | warning: changes are committed in secret phase from subrepository s |
General Comments 0
You need to be logged in to leave comments.
Login now