equal
deleted
inserted
replaced
153 adding manifests |
153 adding manifests |
154 adding file changes |
154 adding file changes |
155 added 1 changesets with 1 changes to 1 files (+1 heads) |
155 added 1 changesets with 1 changes to 1 files (+1 heads) |
156 (run 'hg heads' to see heads, 'hg merge' to merge) |
156 (run 'hg heads' to see heads, 'hg merge' to merge) |
157 $ hg merge 2>/dev/null |
157 $ hg merge 2>/dev/null |
158 pulling subrepo s |
158 pulling subrepo s from $TESTTMP/gitroot |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 (branch merge, don't forget to commit) |
160 (branch merge, don't forget to commit) |
161 $ cat s/f |
161 $ cat s/f |
162 f |
162 f |
163 $ cat s/g |
163 $ cat s/g |
230 $ hg push -q |
230 $ hg push -q |
231 |
231 |
232 $ cd ../tb |
232 $ cd ../tb |
233 $ hg pull -q |
233 $ hg pull -q |
234 $ hg update 2>/dev/null |
234 $ hg update 2>/dev/null |
235 pulling subrepo s |
235 pulling subrepo s from $TESTTMP/gitroot |
236 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
236 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
237 $ hg debugsub |
237 $ hg debugsub |
238 path s |
238 path s |
239 source ../gitroot |
239 source ../gitroot |
240 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
240 revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
260 archive subrepos |
260 archive subrepos |
261 |
261 |
262 $ cd ../tc |
262 $ cd ../tc |
263 $ hg pull -q |
263 $ hg pull -q |
264 $ hg archive --subrepos -r 5 ../archive 2>/dev/null |
264 $ hg archive --subrepos -r 5 ../archive 2>/dev/null |
265 pulling subrepo s |
265 pulling subrepo s from $TESTTMP/gitroot |
266 $ cd ../archive |
266 $ cd ../archive |
267 $ cat s/f |
267 $ cat s/f |
268 f |
268 f |
269 $ cat s/g |
269 $ cat s/g |
270 g |
270 g |