equal
deleted
inserted
replaced
211 added 1 changesets with 1 changes to 1 files (+1 heads) |
211 added 1 changesets with 1 changes to 1 files (+1 heads) |
212 new changesets 089416c11d73 |
212 new changesets 089416c11d73 |
213 (run 'hg heads' to see heads, 'hg merge' to merge) |
213 (run 'hg heads' to see heads, 'hg merge' to merge) |
214 $ hg merge 2>/dev/null |
214 $ hg merge 2>/dev/null |
215 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
215 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
216 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m |
216 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. |
|
217 what do you want to do? m |
217 pulling subrepo s from $TESTTMP/gitroot |
218 pulling subrepo s from $TESTTMP/gitroot |
218 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
219 (branch merge, don't forget to commit) |
220 (branch merge, don't forget to commit) |
220 $ hg st --subrepos s |
221 $ hg st --subrepos s |
221 A s/f |
222 A s/f |
549 $ git rev-parse HEAD |
550 $ git rev-parse HEAD |
550 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
551 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
551 $ cd .. |
552 $ cd .. |
552 $ hg update 4 |
553 $ hg update 4 |
553 subrepository s diverged (local revision: da5f5b1, remote revision: aa84837) |
554 subrepository s diverged (local revision: da5f5b1, remote revision: aa84837) |
554 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
555 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
556 what do you want to do? m |
555 subrepository sources for s differ |
557 subrepository sources for s differ |
556 use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? l |
558 you can use (l)ocal source (da5f5b1) or (r)emote source (aa84837). |
|
559 what do you want to do? l |
557 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
560 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
558 $ hg id -n |
561 $ hg id -n |
559 4+ |
562 4+ |
560 $ cd s |
563 $ cd s |
561 $ git rev-parse HEAD |
564 $ git rev-parse HEAD |
575 Previous HEAD position was 32a3438* fff (glob) |
578 Previous HEAD position was 32a3438* fff (glob) |
576 HEAD is now at aa84837* f (glob) |
579 HEAD is now at aa84837* f (glob) |
577 $ cd .. |
580 $ cd .. |
578 $ hg update 1 |
581 $ hg update 1 |
579 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
582 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
580 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
583 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
584 what do you want to do? m |
581 subrepository sources for s differ (in checked out version) |
585 subrepository sources for s differ (in checked out version) |
582 use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l |
586 you can use (l)ocal source (32a3438) or (r)emote source (da5f5b1). |
|
587 what do you want to do? l |
583 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
588 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
584 $ hg id -n |
589 $ hg id -n |
585 1+ |
590 1+ |
586 $ cd s |
591 $ cd s |
587 $ git rev-parse HEAD |
592 $ git rev-parse HEAD |
597 $ cd .. |
602 $ cd .. |
598 $ hg id -n |
603 $ hg id -n |
599 1+ |
604 1+ |
600 $ hg update 7 |
605 $ hg update 7 |
601 subrepository s diverged (local revision: 32a3438, remote revision: 32a3438) |
606 subrepository s diverged (local revision: 32a3438, remote revision: 32a3438) |
602 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
607 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
608 what do you want to do? m |
603 subrepository sources for s differ |
609 subrepository sources for s differ |
604 use (l)ocal source (32a3438) or (r)emote source (32a3438)? l |
610 you can use (l)ocal source (32a3438) or (r)emote source (32a3438). |
|
611 what do you want to do? l |
605 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
612 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
606 $ hg id -n |
613 $ hg id -n |
607 7+ |
614 7+ |
608 $ cd s |
615 $ cd s |
609 $ git rev-parse HEAD |
616 $ git rev-parse HEAD |