equal
deleted
inserted
replaced
587 added 2 changesets with 2 changes to 2 files (+1 heads) |
587 added 2 changesets with 2 changes to 2 files (+1 heads) |
588 (run 'hg heads' to see heads, 'hg merge' to merge) |
588 (run 'hg heads' to see heads, 'hg merge' to merge) |
589 |
589 |
590 update to active bookmark if it's not the parent |
590 update to active bookmark if it's not the parent |
591 |
591 |
|
592 (it is known issue that fsmonitor can't handle nested repositories. In |
|
593 this test scenario, cloned-bookmark-default and tobundle exist in the |
|
594 working directory of current repository) |
|
595 |
592 $ hg summary |
596 $ hg summary |
593 parent: 2:db815d6d32e6 |
597 parent: 2:db815d6d32e6 |
594 2 |
598 2 |
595 branch: default |
599 branch: default |
596 bookmarks: *Z Y x y |
600 bookmarks: *Z Y x y |
597 commit: 1 added, 1 unknown (new branch head) |
601 commit: 1 added, 1 unknown (new branch head) (no-fsmonitor !) |
|
602 commit: 1 added, * unknown (new branch head) (glob) (fsmonitor !) |
598 update: 2 new changesets (update) |
603 update: 2 new changesets (update) |
599 phases: 5 draft |
604 phases: 5 draft |
600 $ hg update |
605 $ hg update |
601 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
606 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
602 updating bookmark Z |
607 updating bookmark Z |
772 summary: 0 |
777 summary: 0 |
773 |
778 |
774 |
779 |
775 no-op update doesn't deactivate bookmarks |
780 no-op update doesn't deactivate bookmarks |
776 |
781 |
|
782 (it is known issue that fsmonitor can't handle nested repositories. In |
|
783 this test scenario, cloned-bookmark-default and tobundle exist in the |
|
784 working directory of current repository) |
|
785 |
777 $ hg bookmarks |
786 $ hg bookmarks |
778 * four 3:9ba5f110a0b3 |
787 * four 3:9ba5f110a0b3 |
779 should-end-on-two 2:db815d6d32e6 |
788 should-end-on-two 2:db815d6d32e6 |
780 $ hg up four |
789 $ hg up four |
781 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
790 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
784 $ hg sum |
793 $ hg sum |
785 parent: 3:9ba5f110a0b3 tip |
794 parent: 3:9ba5f110a0b3 tip |
786 y |
795 y |
787 branch: test |
796 branch: test |
788 bookmarks: *four |
797 bookmarks: *four |
789 commit: 2 unknown (clean) |
798 commit: 2 unknown (clean) (no-fsmonitor !) |
|
799 commit: * unknown (clean) (glob) (fsmonitor !) |
790 update: (current) |
800 update: (current) |
791 phases: 4 draft |
801 phases: 4 draft |
792 |
802 |
793 test clearing divergent bookmarks of linear ancestors |
803 test clearing divergent bookmarks of linear ancestors |
794 |
804 |