Show More
@@ -31,5 +31,3 b' called and .hg/journal.dirstate will not' | |||||
31 | rollback completed |
|
31 | rollback completed | |
32 | abort: no commits allowed |
|
32 | abort: no commits allowed | |
33 | [255] |
|
33 | [255] | |
34 |
|
||||
35 | $ exit 0 |
|
@@ -198,5 +198,3 b' invalid arguments' | |||||
198 |
|
198 | |||
199 | use "hg -v help rt" to show global options |
|
199 | use "hg -v help rt" to show global options | |
200 | [255] |
|
200 | [255] | |
201 |
|
||||
202 | $ exit 0 |
|
@@ -233,5 +233,3 b' old file -- date clamped to 1980' | |||||
233 | 0 1980-01-01 00:00 old/old |
|
233 | 0 1980-01-01 00:00 old/old | |
234 | --------- ------- |
|
234 | --------- ------- | |
235 | 147 2 files |
|
235 | 147 2 files | |
236 |
|
||||
237 | $ exit 0 |
|
@@ -80,5 +80,3 b' attack /tmp/test' | |||||
80 | $ hg update -Cr4 |
|
80 | $ hg update -Cr4 | |
81 | abort: No such file or directory: .*/test-audit-path.t/target//tmp/test |
|
81 | abort: No such file or directory: .*/test-audit-path.t/target//tmp/test | |
82 | [255] |
|
82 | [255] | |
83 |
|
||||
84 | $ exit 0 |
|
@@ -259,5 +259,3 b' on branch1, so no file1 and file2:' | |||||
259 | $ hg st -A |
|
259 | $ hg st -A | |
260 | C default |
|
260 | C default | |
261 | C file1 |
|
261 | C file1 | |
262 |
|
||||
263 | $ exit 0 |
|
@@ -45,5 +45,3 b' Mark the conflict as resolved and commit' | |||||
45 |
|
45 | |||
46 | $ hg resolve -m A |
|
46 | $ hg resolve -m A | |
47 | $ hg commit -m "Merged" |
|
47 | $ hg commit -m "Merged" | |
48 |
|
||||
49 | $ exit 0 |
|
@@ -265,6 +265,3 b' test commit message content' | |||||
265 | HG: removed removed |
|
265 | HG: removed removed | |
266 | abort: empty commit message |
|
266 | abort: empty commit message | |
267 | [255] |
|
267 | [255] | |
268 | $ cd .. |
|
|||
269 |
|
||||
270 | $ exit 0 |
|
@@ -100,5 +100,3 b" but it's considered modified after a cop" | |||||
100 | $ hg st -AC foo |
|
100 | $ hg st -AC foo | |
101 | M foo |
|
101 | M foo | |
102 | bar |
|
102 | bar | |
103 |
|
||||
104 | $ exit 0 |
|
@@ -247,5 +247,3 b' Show all commands + options' | |||||
247 | unbundle: update |
|
247 | unbundle: update | |
248 | verify: |
|
248 | verify: | |
249 | version: |
|
249 | version: | |
250 |
|
||||
251 | $ exit 0 |
|
@@ -64,5 +64,3 b' No repo:' | |||||
64 | abort: There is no Mercurial repository here (.hg not found)! |
|
64 | abort: There is no Mercurial repository here (.hg not found)! | |
65 | [255] |
|
65 | [255] | |
66 |
|
66 | |||
67 | $ exit 0 |
|
|||
68 |
|
@@ -105,5 +105,3 b' Compare repos:' | |||||
105 | no changes found |
|
105 | no changes found | |
106 | [1] |
|
106 | [1] | |
107 |
|
107 | |||
108 | $ exit 0 |
|
|||
109 |
|
@@ -318,6 +318,3 b' Broken disabled extension and command:' | |||||
318 | $ hg --config extensions.path=./path.py help foo > /dev/null |
|
318 | $ hg --config extensions.path=./path.py help foo > /dev/null | |
319 | hg: unknown command 'foo' |
|
319 | hg: unknown command 'foo' | |
320 | [255] |
|
320 | [255] | |
321 |
|
||||
322 | $ exit 0 |
|
|||
323 |
|
@@ -479,4 +479,3 b'' | |||||
479 | cb9a9f314b8b |
|
479 | cb9a9f314b8b | |
480 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
480 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
481 |
|
481 | |||
482 | $ exit 0 |
|
@@ -57,5 +57,3 b' Should fail - would corrupt dirstate:' | |||||
57 | abort: directory 'b' already in dirstate |
|
57 | abort: directory 'b' already in dirstate | |
58 | [255] |
|
58 | [255] | |
59 |
|
59 | |||
60 | $ exit 0 |
|
|||
61 |
|
@@ -32,5 +32,3 b' Check that zero-size journals are correc' | |||||
32 |
|
32 | |||
33 | $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi |
|
33 | $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi | |
34 |
|
34 | |||
35 | $ exit 0 |
|
|||
36 |
|
@@ -1020,5 +1020,3 b' log -p -R repo' | |||||
1020 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1020 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1021 | summary: add foo, related |
|
1021 | summary: add foo, related | |
1022 |
|
1022 | |||
1023 |
|
||||
1024 | $ exit 0 |
|
@@ -11,4 +11,3 b" test that 'hg commit' does not crash if " | |||||
11 | removing b |
|
11 | removing b | |
12 | nothing changed |
|
12 | nothing changed | |
13 | [1] |
|
13 | [1] | |
14 | $ exit 0 |
|
@@ -115,5 +115,3 b' debugsub output for main and sub1' | |||||
115 | path sub2 |
|
115 | path sub2 | |
116 | source ../sub2 |
|
116 | source ../sub2 | |
117 | revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487 |
|
117 | revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487 | |
118 |
|
||||
119 | $ exit 0 |
|
@@ -30,5 +30,3 b' test bad subpaths pattern' | |||||
30 | $ hg debugsub |
|
30 | $ hg debugsub | |
31 | abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference |
|
31 | abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference | |
32 | [255] |
|
32 | [255] | |
33 |
|
||||
34 | $ exit 0 |
|
@@ -67,5 +67,3 b" subrepo debug for 'main' clone" | |||||
67 | revision 863c1745b441bd97a8c4a096e87793073f4fb215 |
|
67 | revision 863c1745b441bd97a8c4a096e87793073f4fb215 | |
68 |
|
68 | |||
69 | $ "$TESTDIR/killdaemons.py" |
|
69 | $ "$TESTDIR/killdaemons.py" | |
70 |
|
||||
71 | $ exit 0 |
|
@@ -584,5 +584,3 b' issue 1977' | |||||
584 | $ hg -R repo update |
|
584 | $ hg -R repo update | |
585 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
585 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
586 | $ rm -rf repo2 repo |
|
586 | $ rm -rf repo2 repo | |
587 |
|
||||
588 | $ exit 0 |
|
General Comments 0
You need to be logged in to leave comments.
Login now