equal
deleted
inserted
replaced
730 $ hg book -d drop |
730 $ hg book -d drop |
731 $ hg up four |
731 $ hg up four |
732 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
732 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
733 (activating bookmark four) |
733 (activating bookmark four) |
734 |
734 |
|
735 no-op update doesn't deactive bookmarks |
|
736 |
|
737 $ hg up |
|
738 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
739 $ hg sum |
|
740 parent: 3:9ba5f110a0b3 tip |
|
741 y |
|
742 branch: test |
|
743 bookmarks: *four |
|
744 commit: 2 unknown (clean) |
|
745 update: (current) |
|
746 phases: 4 draft |
|
747 |
735 test clearing divergent bookmarks of linear ancestors |
748 test clearing divergent bookmarks of linear ancestors |
736 |
749 |
737 $ hg bookmark Z -r 0 |
750 $ hg bookmark Z -r 0 |
738 $ hg bookmark Z@1 -r 1 |
751 $ hg bookmark Z@1 -r 1 |
739 $ hg bookmark Z@2 -r 2 |
752 $ hg bookmark Z@2 -r 2 |