equal
deleted
inserted
replaced
83 | |
83 | |
84 | o 1: 'B' bookmarks: X |
84 | o 1: 'B' bookmarks: X |
85 |/ |
85 |/ |
86 o 0: 'A' bookmarks: Y@diverge |
86 o 0: 'A' bookmarks: Y@diverge |
87 |
87 |
|
88 Do not try to keep active but deleted divergent bookmark |
|
89 |
|
90 $ cd .. |
|
91 $ hg clone -q a a4 |
|
92 |
|
93 $ cd a4 |
|
94 $ hg up -q 2 |
|
95 $ hg book W@diverge |
|
96 |
|
97 $ hg rebase -s W -d . |
|
98 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
|
99 |
|
100 $ hg bookmarks |
|
101 W 3:0d3554f74897 |
|
102 X 1:6c81ed0049f8 |
|
103 Y 2:49cb3485fa0c |
|
104 Z 2:49cb3485fa0c |
|
105 |
88 Keep bookmarks to the correct rebased changeset |
106 Keep bookmarks to the correct rebased changeset |
89 |
107 |
90 $ cd .. |
108 $ cd .. |
91 $ hg clone -q a a2 |
109 $ hg clone -q a a2 |
92 |
110 |