Show More
@@ -71,7 +71,7 b' make $GITROOT pushable, by replacing it ' | |||||
71 | clone root |
|
71 | clone root | |
72 |
|
72 | |||
73 | $ cd t |
|
73 | $ cd t | |
74 | $ hg clone . ../tc |
|
74 | $ hg clone . ../tc 2> /dev/null | |
75 | updating to branch default |
|
75 | updating to branch default | |
76 | cloning subrepo s from $TESTTMP/gitroot |
|
76 | cloning subrepo s from $TESTTMP/gitroot | |
77 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -94,7 +94,7 b' update to previous substate' | |||||
94 | clone root, make local change |
|
94 | clone root, make local change | |
95 |
|
95 | |||
96 | $ cd ../t |
|
96 | $ cd ../t | |
97 | $ hg clone . ../ta |
|
97 | $ hg clone . ../ta 2> /dev/null | |
98 | updating to branch default |
|
98 | updating to branch default | |
99 | cloning subrepo s from $TESTTMP/gitroot |
|
99 | cloning subrepo s from $TESTTMP/gitroot | |
100 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -113,7 +113,7 b' clone root, make local change' | |||||
113 | clone root separately, make different local change |
|
113 | clone root separately, make different local change | |
114 |
|
114 | |||
115 | $ cd ../t |
|
115 | $ cd ../t | |
116 | $ hg clone . ../tb |
|
116 | $ hg clone . ../tb 2> /dev/null | |
117 | updating to branch default |
|
117 | updating to branch default | |
118 | cloning subrepo s from $TESTTMP/gitroot |
|
118 | cloning subrepo s from $TESTTMP/gitroot | |
119 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
119 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -199,7 +199,7 b' make upstream git changes' | |||||
199 | make and push changes to hg without updating the subrepo |
|
199 | make and push changes to hg without updating the subrepo | |
200 |
|
200 | |||
201 | $ cd ../t |
|
201 | $ cd ../t | |
202 | $ hg clone . ../td |
|
202 | $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.' | |
203 | updating to branch default |
|
203 | updating to branch default | |
204 | cloning subrepo s from $TESTTMP/gitroot |
|
204 | cloning subrepo s from $TESTTMP/gitroot | |
205 | checking out detached HEAD in subrepo s |
|
205 | checking out detached HEAD in subrepo s | |
@@ -317,7 +317,7 b' create nested repo' | |||||
317 | $ hg add b |
|
317 | $ hg add b | |
318 | $ hg commit -m b |
|
318 | $ hg commit -m b | |
319 |
|
319 | |||
320 | $ hg clone ../t inner |
|
320 | $ hg clone ../t inner 2> /dev/null | |
321 | updating to branch default |
|
321 | updating to branch default | |
322 | cloning subrepo s from $TESTTMP/gitroot |
|
322 | cloning subrepo s from $TESTTMP/gitroot | |
323 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
323 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -345,7 +345,7 b' relative source expansion' | |||||
345 |
|
345 | |||
346 | $ cd .. |
|
346 | $ cd .. | |
347 | $ mkdir d |
|
347 | $ mkdir d | |
348 | $ hg clone t d/t |
|
348 | $ hg clone t d/t 2> /dev/null | |
349 | updating to branch default |
|
349 | updating to branch default | |
350 | cloning subrepo s from $TESTTMP/gitroot |
|
350 | cloning subrepo s from $TESTTMP/gitroot | |
351 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
351 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -364,7 +364,7 b" Don't crash if the subrepo is missing" | |||||
364 | $ hg commit --subrepos -qm missing |
|
364 | $ hg commit --subrepos -qm missing | |
365 | abort: subrepo s is missing (in subrepo s) |
|
365 | abort: subrepo s is missing (in subrepo s) | |
366 | [255] |
|
366 | [255] | |
367 | $ hg update -C |
|
367 | $ hg update -C 2> /dev/null | |
368 | cloning subrepo s from $TESTTMP/gitroot |
|
368 | cloning subrepo s from $TESTTMP/gitroot | |
369 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
369 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
370 | $ hg sum | grep commit |
|
370 | $ hg sum | grep commit |
General Comments 0
You need to be logged in to leave comments.
Login now