equal
deleted
inserted
replaced
51 | x 1:37445b16603b@default(draft) add _b |
51 | x 1:37445b16603b@default(draft) add _b |
52 |/ |
52 |/ |
53 o 0:135f39f4bd78@default(draft) add _a |
53 o 0:135f39f4bd78@default(draft) add _a |
54 |
54 |
55 |
55 |
56 $ hg evo --all --any --unstable |
56 $ hg evo --all --any --orphan |
57 move:[2] add _c |
57 move:[2] add _c |
58 atop:[3] bprime |
58 atop:[3] bprime |
59 working directory is now at fdcf3523a74d |
59 working directory is now at fdcf3523a74d |
60 $ hg log -G |
60 $ hg log -G |
61 @ 4:fdcf3523a74d@default(draft) add _c |
61 @ 4:fdcf3523a74d@default(draft) add _c |
97 | x 1:b3264cec9506@default(draft) add _a |
97 | x 1:b3264cec9506@default(draft) add _a |
98 |/ |
98 |/ |
99 o 0:b4952fcf48cf@default(draft) add base |
99 o 0:b4952fcf48cf@default(draft) add base |
100 |
100 |
101 |
101 |
102 $ hg evo --all --any --unstable |
102 $ hg evo --all --any --orphan |
103 move:[3] merge |
103 move:[3] merge |
104 atop:[4] aprime |
104 atop:[4] aprime |
105 working directory is now at 0bf3f3a59c8c |
105 working directory is now at 0bf3f3a59c8c |
106 $ hg log -G |
106 $ hg log -G |
107 @ 5:0bf3f3a59c8c@default(draft) merge |
107 @ 5:0bf3f3a59c8c@default(draft) merge |
150 | x 1:b3264cec9506@default(draft) add _a |
150 | x 1:b3264cec9506@default(draft) add _a |
151 |/ |
151 |/ |
152 o 0:b4952fcf48cf@default(draft) add base |
152 o 0:b4952fcf48cf@default(draft) add base |
153 |
153 |
154 |
154 |
155 $ hg evo --all --any --unstable |
155 $ hg evo --all --any --orphan |
156 warning: no support for evolving merge changesets with two obsolete parents yet |
156 warning: no support for evolving merge changesets with two obsolete parents yet |
157 (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one) |
157 (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one) |
158 $ hg log -G |
158 $ hg log -G |
159 @ 5:2db39fda7e2f@default(draft) cprime |
159 @ 5:2db39fda7e2f@default(draft) cprime |
160 | |
160 | |
196 | x 1:37445b16603b@default(draft) add _b |
196 | x 1:37445b16603b@default(draft) add _b |
197 |/ |
197 |/ |
198 o 0:135f39f4bd78@default(draft) add _a |
198 o 0:135f39f4bd78@default(draft) add _a |
199 |
199 |
200 |
200 |
201 $ hg evo --all --any --unstable |
201 $ hg evo --all --any --orphan |
202 move:[2] add _c |
202 move:[2] add _c |
203 atop:[4] add bprimesplit2 |
203 atop:[4] add bprimesplit2 |
204 working directory is now at 387cc1e837d7 |
204 working directory is now at 387cc1e837d7 |
205 $ hg log -G |
205 $ hg log -G |
206 @ 5:387cc1e837d7@default(draft) add _c |
206 @ 5:387cc1e837d7@default(draft) add _c |
250 | x 1:37445b16603b@default(draft) add _b |
250 | x 1:37445b16603b@default(draft) add _b |
251 |/ |
251 |/ |
252 o 0:135f39f4bd78@default(draft) add _a |
252 o 0:135f39f4bd78@default(draft) add _a |
253 |
253 |
254 |
254 |
255 $ hg evo --all --any --unstable |
255 $ hg evo --all --any --orphan |
256 move:[2] add _c |
256 move:[2] add _c |
257 atop:[6] add bsecondsplit2 |
257 atop:[6] add bsecondsplit2 |
258 working directory is now at 98e3f21461ff |
258 working directory is now at 98e3f21461ff |
259 $ hg log -G |
259 $ hg log -G |
260 @ 7:98e3f21461ff@default(draft) add _c |
260 @ 7:98e3f21461ff@default(draft) add _c |
299 | x 1:37445b16603b@default(draft) add _b |
299 | x 1:37445b16603b@default(draft) add _b |
300 |/ |
300 |/ |
301 o 0:135f39f4bd78@default(draft) add _a |
301 o 0:135f39f4bd78@default(draft) add _a |
302 |
302 |
303 |
303 |
304 $ hg evo --all --any --unstable |
304 $ hg evo --all --any --orphan |
305 cannot solve split accross two branches |
305 cannot solve split accross two branches |
306 $ hg log -G |
306 $ hg log -G |
307 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
307 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 |
308 | |
308 | |
309 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |
309 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 |