equal
deleted
inserted
replaced
318 $ cd .. |
318 $ cd .. |
319 $ hg pull -q ../tb |
319 $ hg pull -q ../tb |
320 $ hg up |
320 $ hg up |
321 From $TESTTMP/tb/s |
321 From $TESTTMP/tb/s |
322 * [new branch] b2 -> origin/b2 |
322 * [new branch] b2 -> origin/b2 |
323 Previous HEAD position was f47b465... merge |
323 Previous HEAD position was f47b465* merge (glob) |
324 Switched to a new branch 'b2' |
324 Switched to a new branch 'b2' |
325 pulling subrepo s from $TESTTMP/tb/s |
325 pulling subrepo s from $TESTTMP/tb/s |
326 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
326 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
327 |
327 |
328 update to a revision without the subrepo, keeping the local git repository |
328 update to a revision without the subrepo, keeping the local git repository |
570 $ git rev-parse HEAD |
570 $ git rev-parse HEAD |
571 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
571 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
572 $ cd .. |
572 $ cd .. |
573 $ cd s |
573 $ cd s |
574 $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
574 $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
575 Previous HEAD position was 32a3438... fff |
575 Previous HEAD position was 32a3438* fff (glob) |
576 HEAD is now at aa84837... f |
576 HEAD is now at aa84837* f (glob) |
577 $ cd .. |
577 $ cd .. |
578 $ hg update 1 |
578 $ hg update 1 |
579 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
579 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
580 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
580 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
581 subrepository sources for s differ (in checked out version) |
581 subrepository sources for s differ (in checked out version) |
621 $ cd .. |
621 $ cd .. |
622 |
622 |
623 Test subrepo already at intended revision: |
623 Test subrepo already at intended revision: |
624 $ cd s |
624 $ cd s |
625 $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
625 $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
626 HEAD is now at 32a3438... fff |
626 HEAD is now at 32a3438* fff (glob) |
627 $ cd .. |
627 $ cd .. |
628 $ hg update 1 |
628 $ hg update 1 |
629 Previous HEAD position was 32a3438... fff |
629 Previous HEAD position was 32a3438* fff (glob) |
630 HEAD is now at da5f5b1... g |
630 HEAD is now at da5f5b1* g (glob) |
631 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
631 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
632 $ hg id -n |
632 $ hg id -n |
633 1 |
633 1 |
634 $ cd s |
634 $ cd s |
635 $ git rev-parse HEAD |
635 $ git rev-parse HEAD |