Show More
@@ -589,12 +589,17 b' create bundle with two heads' | |||
|
589 | 589 | |
|
590 | 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 | 596 | $ hg summary |
|
593 | 597 | parent: 2:db815d6d32e6 |
|
594 | 598 | 2 |
|
595 | 599 | branch: default |
|
596 | 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 | 603 | update: 2 new changesets (update) |
|
599 | 604 | phases: 5 draft |
|
600 | 605 | $ hg update |
@@ -774,6 +779,10 b' tipmost surviving ancestor of the stripp' | |||
|
774 | 779 | |
|
775 | 780 |
|
|
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 | 786 | $ hg bookmarks |
|
778 | 787 | * four 3:9ba5f110a0b3 |
|
779 | 788 | should-end-on-two 2:db815d6d32e6 |
@@ -786,7 +795,8 b" no-op update doesn't deactivate bookmark" | |||
|
786 | 795 | y |
|
787 | 796 | branch: test |
|
788 | 797 | bookmarks: *four |
|
789 | commit: 2 unknown (clean) | |
|
798 | commit: 2 unknown (clean) (no-fsmonitor !) | |
|
799 | commit: * unknown (clean) (glob) (fsmonitor !) | |
|
790 | 800 | update: (current) |
|
791 | 801 | phases: 4 draft |
|
792 | 802 |
General Comments 0
You need to be logged in to leave comments.
Login now