Show More
@@ -85,7 +85,7 b' Check that path aliases are expanded:' | |||||
85 |
|
85 | |||
86 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f |
|
86 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f | |
87 | $ hg -R f showconfig paths.default |
|
87 | $ hg -R f showconfig paths.default | |
88 | $TESTTMP/a#0 |
|
88 | $TESTTMP/a#0 (glob) | |
89 |
|
89 | |||
90 | Use --pull: |
|
90 | Use --pull: | |
91 |
|
91 |
@@ -372,7 +372,7 b' Ensure --continue restores a correct sta' | |||||
372 | [255] |
|
372 | [255] | |
373 | $ hg resolve --all -t internal:local |
|
373 | $ hg resolve --all -t internal:local | |
374 | $ hg rebase -c |
|
374 | $ hg rebase -c | |
375 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg |
|
375 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) | |
376 | $ hg tglog |
|
376 | $ hg tglog | |
377 | @ 8: 'H2' |
|
377 | @ 8: 'H2' | |
378 | | |
|
378 | | |
@@ -23,10 +23,10 b' Add files --- .hgsub files must go first' | |||||
23 | $ hg add -S .hgsub |
|
23 | $ hg add -S .hgsub | |
24 | $ hg add -S foo/.hgsub |
|
24 | $ hg add -S foo/.hgsub | |
25 | $ hg add -S foo/bar |
|
25 | $ hg add -S foo/bar | |
26 | adding foo/bar/z.txt |
|
26 | adding foo/bar/z.txt (glob) | |
27 | $ hg add -S |
|
27 | $ hg add -S | |
28 | adding x.txt |
|
28 | adding x.txt | |
29 | adding foo/y.txt |
|
29 | adding foo/y.txt (glob) | |
30 |
|
30 | |||
31 | Test recursive status without committing anything: |
|
31 | Test recursive status without committing anything: | |
32 |
|
32 | |||
@@ -67,7 +67,7 b' The --subrepos flag overwrite the config' | |||||
67 |
|
67 | |||
68 | $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos |
|
68 | $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos | |
69 | committing subrepository foo |
|
69 | committing subrepository foo | |
70 | committing subrepository foo/bar |
|
70 | committing subrepository foo/bar (glob) | |
71 |
|
71 | |||
72 | $ cd foo |
|
72 | $ cd foo | |
73 | $ echo y2 >> y.txt |
|
73 | $ echo y2 >> y.txt | |
@@ -186,7 +186,7 b' Cleanup and final commit:' | |||||
186 | $ rm -r dir |
|
186 | $ rm -r dir | |
187 | $ hg commit --subrepos -m 2-3-2 |
|
187 | $ hg commit --subrepos -m 2-3-2 | |
188 | committing subrepository foo |
|
188 | committing subrepository foo | |
189 | committing subrepository foo/bar |
|
189 | committing subrepository foo/bar (glob) | |
190 |
|
190 | |||
191 | Log with the relationships between repo and its subrepo: |
|
191 | Log with the relationships between repo and its subrepo: | |
192 |
|
192 | |||
@@ -342,7 +342,7 b' cloned:' | |||||
342 | archiving (foo/bar) [================================>] 1/1 (glob) |
|
342 | archiving (foo/bar) [================================>] 1/1 (glob) | |
343 |
|
343 | |||
344 | cloning subrepo foo from $TESTTMP/repo/foo |
|
344 | cloning subrepo foo from $TESTTMP/repo/foo | |
345 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar |
|
345 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) | |
346 |
|
346 | |||
347 | The newly cloned subrepos contain no working copy: |
|
347 | The newly cloned subrepos contain no working copy: | |
348 |
|
348 | |||
@@ -365,7 +365,7 b' created by archive:' | |||||
365 | $ echo f > foo/f |
|
365 | $ echo f > foo/f | |
366 | $ hg archive --subrepos -r tip archive |
|
366 | $ hg archive --subrepos -r tip archive | |
367 | cloning subrepo foo from $TESTTMP/empty/foo |
|
367 | cloning subrepo foo from $TESTTMP/empty/foo | |
368 | abort: destination '$TESTTMP/almost-empty/foo' is not empty |
|
368 | abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob) | |
369 | [255] |
|
369 | [255] | |
370 |
|
370 | |||
371 | Clone and test outgoing: |
|
371 | Clone and test outgoing: | |
@@ -374,11 +374,11 b' Clone and test outgoing:' | |||||
374 | $ hg clone repo repo2 |
|
374 | $ hg clone repo repo2 | |
375 | updating to branch default |
|
375 | updating to branch default | |
376 | cloning subrepo foo from $TESTTMP/repo/foo |
|
376 | cloning subrepo foo from $TESTTMP/repo/foo | |
377 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar |
|
377 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) | |
378 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
378 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
379 | $ cd repo2 |
|
379 | $ cd repo2 | |
380 | $ hg outgoing -S |
|
380 | $ hg outgoing -S | |
381 | comparing with $TESTTMP/repo |
|
381 | comparing with $TESTTMP/repo (glob) | |
382 | searching for changes |
|
382 | searching for changes | |
383 | no changes found |
|
383 | no changes found | |
384 | comparing with $TESTTMP/repo/foo |
|
384 | comparing with $TESTTMP/repo/foo | |
@@ -404,7 +404,7 b' Make nested change:' | |||||
404 | $ hg commit --subrepos -m 3-4-2 |
|
404 | $ hg commit --subrepos -m 3-4-2 | |
405 | committing subrepository foo |
|
405 | committing subrepository foo | |
406 | $ hg outgoing -S |
|
406 | $ hg outgoing -S | |
407 | comparing with $TESTTMP/repo |
|
407 | comparing with $TESTTMP/repo (glob) | |
408 | searching for changes |
|
408 | searching for changes | |
409 | changeset: 3:2655b8ecc4ee |
|
409 | changeset: 3:2655b8ecc4ee | |
410 | tag: tip |
|
410 | tag: tip | |
@@ -434,7 +434,7 b' Switch to original repo and setup defaul' | |||||
434 | Test incoming: |
|
434 | Test incoming: | |
435 |
|
435 | |||
436 | $ hg incoming -S |
|
436 | $ hg incoming -S | |
437 | comparing with $TESTTMP/repo2 |
|
437 | comparing with $TESTTMP/repo2 (glob) | |
438 | searching for changes |
|
438 | searching for changes | |
439 | changeset: 3:2655b8ecc4ee |
|
439 | changeset: 3:2655b8ecc4ee | |
440 | tag: tip |
|
440 | tag: tip |
@@ -949,8 +949,8 b' Adding without a path or pattern with -S' | |||||
949 | ? s/f9 |
|
949 | ? s/f9 | |
950 | $ hg add -S |
|
950 | $ hg add -S | |
951 | adding f8 |
|
951 | adding f8 | |
952 | adding s/f10 |
|
952 | adding s/f10 (glob) | |
953 | adding s/f9 |
|
953 | adding s/f9 (glob) | |
954 | $ hg st -S |
|
954 | $ hg st -S | |
955 | A f8 |
|
955 | A f8 | |
956 | A s/f10 |
|
956 | A s/f10 | |
@@ -993,7 +993,7 b' Adding with a pattern with -S also adds ' | |||||
993 | ? s/fn18 |
|
993 | ? s/fn18 | |
994 | $ hg add -S 'glob:**fm*' |
|
994 | $ hg add -S 'glob:**fm*' | |
995 | adding fm15 |
|
995 | adding fm15 | |
996 | adding s/fm17 |
|
996 | adding s/fm17 (glob) | |
997 | $ hg st -S |
|
997 | $ hg st -S | |
998 | A fm15 |
|
998 | A fm15 | |
999 | A s/fm17 |
|
999 | A s/fm17 |
@@ -112,7 +112,7 b' and now for something completely differe' | |||||
112 | abort: pretxncommit.crlf hook failed |
|
112 | abort: pretxncommit.crlf hook failed | |
113 | [255] |
|
113 | [255] | |
114 | $ hg revert -a |
|
114 | $ hg revert -a | |
115 | forgetting d/f2 |
|
115 | forgetting d/f2 (glob) | |
116 | $ rm d/f2 |
|
116 | $ rm d/f2 | |
117 |
|
117 | |||
118 | $ hg rem f |
|
118 | $ hg rem f | |
@@ -177,10 +177,10 b' and now for something completely differe' | |||||
177 |
|
177 | |||
178 | $ for x in a b c d; do echo content > dupe/$x; done |
|
178 | $ for x in a b c d; do echo content > dupe/$x; done | |
179 | $ hg -R dupe add |
|
179 | $ hg -R dupe add | |
180 | adding dupe/a |
|
180 | adding dupe/a (glob) | |
181 | adding dupe/b |
|
181 | adding dupe/b (glob) | |
182 | adding dupe/c |
|
182 | adding dupe/c (glob) | |
183 | adding dupe/d |
|
183 | adding dupe/d (glob) | |
184 | $ python unix2dos.py dupe/b dupe/c dupe/d |
|
184 | $ python unix2dos.py dupe/b dupe/c dupe/d | |
185 | $ hg -R dupe ci -m a dupe/a |
|
185 | $ hg -R dupe ci -m a dupe/a | |
186 | $ hg -R dupe ci -m b/c dupe/[bc] |
|
186 | $ hg -R dupe ci -m b/c dupe/[bc] |
General Comments 0
You need to be logged in to leave comments.
Login now