733 o changeset: 0:f7b1eb17ad24 |
733 o changeset: 0:f7b1eb17ad24 |
734 user: test |
734 user: test |
735 date: Thu Jan 01 00:00:00 1970 +0000 |
735 date: Thu Jan 01 00:00:00 1970 +0000 |
736 summary: 0 |
736 summary: 0 |
737 |
737 |
738 test non-linear update not clearing active bookmark |
738 |
739 |
739 no-op update doesn't deactive bookmarks |
740 $ hg up 1 |
740 |
741 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
742 (leaving bookmark four) |
|
743 $ hg book drop |
|
744 $ hg up -C |
|
745 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
746 (leaving bookmark drop) |
|
747 1 other heads for branch "default" |
|
748 $ hg sum |
|
749 parent: 2:db815d6d32e6 |
|
750 2 |
|
751 branch: default |
|
752 bookmarks: should-end-on-two |
|
753 commit: 2 unknown (clean) |
|
754 update: 1 new changesets, 2 branch heads (merge) |
|
755 phases: 4 draft |
|
756 $ hg book |
|
757 drop 1:925d80f479bb |
|
758 four 3:9ba5f110a0b3 |
|
759 should-end-on-two 2:db815d6d32e6 |
|
760 $ hg book -d drop |
|
761 $ hg up four |
741 $ hg up four |
762 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
742 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
763 (activating bookmark four) |
743 (activating bookmark four) |
764 |
|
765 no-op update doesn't deactive bookmarks |
|
766 |
|
767 $ hg up |
744 $ hg up |
768 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
769 $ hg sum |
746 $ hg sum |
770 parent: 3:9ba5f110a0b3 tip |
747 parent: 3:9ba5f110a0b3 tip |
771 y |
748 y |