equal
deleted
inserted
replaced
101 |
101 |
102 |
102 |
103 $ hg evo --all --any --unstable |
103 $ hg evo --all --any --unstable |
104 move:[3] merge |
104 move:[3] merge |
105 atop:[4] aprime |
105 atop:[4] aprime |
106 abort: no support for evolving merge changesets yet |
106 working directory is now at 0bf3f3a59c8c |
107 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) |
107 $ hg log -G |
108 [255] |
108 @ 5:0bf3f3a59c8c@default(draft) merge |
109 $ hg log -G |
109 |\ |
110 @ 4:47127ea62e5f@default(draft) aprime |
110 | o 4:47127ea62e5f@default(draft) aprime |
111 | |
111 | | |
112 | o 3:6b4280e33286@default(draft) merge |
112 o | 2:474da87dd33b@default(draft) add _c |
113 | |\ |
|
114 +---o 2:474da87dd33b@default(draft) add _c |
|
115 | | |
|
116 | x 1:b3264cec9506@default(draft) add _a |
|
117 |/ |
113 |/ |
118 o 0:b4952fcf48cf@default(draft) add base |
114 o 0:b4952fcf48cf@default(draft) add base |
119 |
115 |
120 |
116 |
121 $ cd .. |
117 $ cd .. |
156 |/ |
152 |/ |
157 o 0:b4952fcf48cf@default(draft) add base |
153 o 0:b4952fcf48cf@default(draft) add base |
158 |
154 |
159 |
155 |
160 $ hg evo --all --any --unstable |
156 $ hg evo --all --any --unstable |
161 move:[3] merge |
157 abort: no support for evolving merge changesets with two obsolete parents yet |
162 atop:[5] cprime |
|
163 abort: no support for evolving merge changesets yet |
|
164 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) |
158 (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one) |
165 [255] |
159 [255] |
166 $ hg log -G |
160 $ hg log -G |
167 @ 5:2db39fda7e2f@default(draft) cprime |
161 @ 5:2db39fda7e2f@default(draft) cprime |
168 | |
162 | |