equal
deleted
inserted
replaced
63 |
63 |
64 # our revision is bookmarked |
64 # our revision is bookmarked |
65 |
65 |
66 $ hg up -C e |
66 $ hg up -C e |
67 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
68 (activating bookmark e) |
68 $ hg merge |
69 $ hg merge |
69 abort: no matching bookmark to merge - please merge with an explicit rev or bookmark |
70 abort: no matching bookmark to merge - please merge with an explicit rev or bookmark |
70 (run 'hg heads' to see all heads) |
71 (run 'hg heads' to see all heads) |
71 [255] |
72 [255] |
72 |
73 |
97 date: Thu Jan 01 00:00:00 1970 +0000 |
98 date: Thu Jan 01 00:00:00 1970 +0000 |
98 summary: e |
99 summary: e |
99 |
100 |
100 $ hg up -C e |
101 $ hg up -C e |
101 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
102 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
103 (activating bookmark e) |
102 $ hg bookmarks |
104 $ hg bookmarks |
103 b 1:d2ae7f538514 |
105 b 1:d2ae7f538514 |
104 c 3:b8f96cf4688b |
106 c 3:b8f96cf4688b |
105 * e 5:26bee9c5bcf3 |
107 * e 5:26bee9c5bcf3 |
106 e@diverged 4:a0546fcfe0fb |
108 e@diverged 4:a0546fcfe0fb |