equal
deleted
inserted
replaced
101 |
101 |
102 $ cd ../ta |
102 $ cd ../ta |
103 $ echo ggg >> s/g |
103 $ echo ggg >> s/g |
104 $ hg status --subrepos |
104 $ hg status --subrepos |
105 M s/g |
105 M s/g |
106 $ hg commit -m ggg |
106 $ hg commit --subrepos -m ggg |
107 committing subrepository s |
107 committing subrepository s |
108 $ hg debugsub |
108 $ hg debugsub |
109 path s |
109 path s |
110 source ../gitroot |
110 source ../gitroot |
111 revision 79695940086840c99328513acbe35f90fcd55e57 |
111 revision 79695940086840c99328513acbe35f90fcd55e57 |
123 $ git add f |
123 $ git add f |
124 $ cd .. |
124 $ cd .. |
125 |
125 |
126 $ hg status --subrepos |
126 $ hg status --subrepos |
127 A s/f |
127 A s/f |
128 $ hg commit -m f |
128 $ hg commit --subrepos -m f |
129 committing subrepository s |
129 committing subrepository s |
130 $ hg debugsub |
130 $ hg debugsub |
131 path s |
131 path s |
132 source ../gitroot |
132 source ../gitroot |
133 revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
133 revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
162 f |
162 f |
163 $ cat s/g |
163 $ cat s/g |
164 g |
164 g |
165 gg |
165 gg |
166 ggg |
166 ggg |
167 $ hg commit -m 'merge' |
167 $ hg commit --subrepos -m 'merge' |
168 committing subrepository s |
168 committing subrepository s |
169 $ hg status --subrepos --rev 1:5 |
169 $ hg status --subrepos --rev 1:5 |
170 M .hgsubstate |
170 M .hgsubstate |
171 M s/g |
171 M s/g |
172 A s/f |
172 A s/f |
292 nested commit |
292 nested commit |
293 |
293 |
294 $ echo ffff >> inner/s/f |
294 $ echo ffff >> inner/s/f |
295 $ hg status --subrepos |
295 $ hg status --subrepos |
296 M inner/s/f |
296 M inner/s/f |
297 $ hg commit -m nested |
297 $ hg commit --subrepos -m nested |
298 committing subrepository inner |
298 committing subrepository inner |
299 committing subrepository inner/s |
299 committing subrepository inner/s |
300 |
300 |
301 nested archive |
301 nested archive |
302 |
302 |
323 $ hg sum | grep commit |
323 $ hg sum | grep commit |
324 commit: 1 subrepos |
324 commit: 1 subrepos |
325 $ hg push -q |
325 $ hg push -q |
326 abort: subrepo s is missing |
326 abort: subrepo s is missing |
327 [255] |
327 [255] |
328 $ hg commit -qm missing |
328 $ hg commit --subrepos -qm missing |
329 abort: subrepo s is missing |
329 abort: subrepo s is missing |
330 [255] |
330 [255] |
331 $ hg update -C |
331 $ hg update -C |
332 cloning subrepo s from $TESTTMP/gitroot |
332 cloning subrepo s from $TESTTMP/gitroot |
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |