Mercurial > hg
comparison tests/test-subrepo.t @ 32698:1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Currently when we have multiple heads on the same branch, update tells us that
there some more heads for the current branch but does not tells us the head to
which the repository has been updated to. It makes more sense showing the
head we updated to and then telling there are some more heads.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 06 Jun 2017 22:17:39 +0530 |
parents | bcb6684d144b |
children | 6d88468d435b |
comparison
equal
deleted
inserted
replaced
32697:19b9fc40cc51 | 32698:1b5c61d38a52 |
---|---|
678 update | 678 update |
679 | 679 |
680 $ cd ../t | 680 $ cd ../t |
681 $ hg up -C # discard our earlier merge | 681 $ hg up -C # discard our earlier merge |
682 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 682 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
683 updated to "c373c8102e68: 12" | |
683 2 other heads for branch "default" | 684 2 other heads for branch "default" |
684 $ echo blah > t/t | 685 $ echo blah > t/t |
685 $ hg ci -m13 | 686 $ hg ci -m13 |
686 committing subrepository t | 687 committing subrepository t |
687 | 688 |
692 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 693 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
693 changeset c373c8102e68 backed out, don't forget to commit. | 694 changeset c373c8102e68 backed out, don't forget to commit. |
694 | 695 |
695 $ hg up -C # discard changes | 696 $ hg up -C # discard changes |
696 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 697 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
698 updated to "925c17564ef8: 13" | |
697 2 other heads for branch "default" | 699 2 other heads for branch "default" |
698 | 700 |
699 pull | 701 pull |
700 | 702 |
701 $ cd ../tc | 703 $ cd ../tc |
734 adding changesets | 736 adding changesets |
735 adding manifests | 737 adding manifests |
736 adding file changes | 738 adding file changes |
737 added 1 changesets with 1 changes to 1 files | 739 added 1 changesets with 1 changes to 1 files |
738 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 740 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
741 updated to "925c17564ef8: 13" | |
739 2 other heads for branch "default" | 742 2 other heads for branch "default" |
740 $ cat t/t | 743 $ cat t/t |
741 blah | 744 blah |
742 | 745 |
743 bogus subrepo path aborts | 746 bogus subrepo path aborts |
1210 M s/a | 1213 M s/a |
1211 A s/b | 1214 A s/b |
1212 ? s/c | 1215 ? s/c |
1213 $ hg update -C | 1216 $ hg update -C |
1214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1217 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1218 updated to "925c17564ef8: 13" | |
1215 2 other heads for branch "default" | 1219 2 other heads for branch "default" |
1216 $ hg status -S | 1220 $ hg status -S |
1217 ? s/b | 1221 ? s/b |
1218 ? s/c | 1222 ? s/c |
1219 | 1223 |