Show More
@@ -251,11 +251,46 b' Cannot cause divergence by default' | |||
|
251 | 251 | $ hg amend -m divergent --config experimental.evolution.allowdivergence=true |
|
252 | 252 | 2 new content-divergent changesets |
|
253 | 253 | |
|
254 | Amending pruned part of split commit does not cause divergence (issue6262) | |
|
255 | ||
|
256 | $ hg debugobsolete $(hg log -T '{node}' -r .) | |
|
257 | 1 new obsolescence markers | |
|
258 | obsoleted 1 changesets | |
|
259 | $ hg co '.^' | |
|
260 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
261 | $ node_B=$(hg log -T '{node}' -r 4) | |
|
262 | $ hg revert -r $node_B -a | |
|
263 | adding B | |
|
264 | adding bar | |
|
265 | $ hg ci -m B-split1 | |
|
266 | created new head | |
|
267 | $ node_B_split1=$(hg log -T '{node}' -r .) | |
|
268 | $ hg co '.^' | |
|
269 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
|
270 | $ hg revert -r 4 -a | |
|
271 | adding B | |
|
272 | adding bar | |
|
273 | $ hg ci -m B-split2 | |
|
274 | created new head | |
|
275 | $ node_B_split2=$(hg log -T '{node}' -r .) | |
|
276 | $ hg debugobsolete $node_B $node_B_split1 $node_B_split2 | |
|
277 | 1 new obsolescence markers | |
|
278 | obsoleted 1 changesets | |
|
279 | $ hg debugobsolete $node_B_split2 | |
|
280 | 1 new obsolescence markers | |
|
281 | obsoleted 1 changesets | |
|
282 | $ hg co --hidden $node_B_split2 | |
|
283 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
284 | $ hg amend -m 'revived B-split2' | |
|
285 | abort: cannot amend 809fe227532f, as that creates content-divergence with c68306a86921, from 16084da537dd (known-bad-output !) | |
|
286 | (add --verbose for details or see 'hg help evolution.instability') (known-bad-output !) | |
|
287 | [10] | |
|
288 | ||
|
254 | 289 | Hidden common predecessor of divergence does not cause crash |
|
255 | 290 | |
|
256 | 291 | First create C1 as a pruned successor of C |
|
257 | 292 | $ hg co C |
|
258 |
|
|
|
293 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
259 | 294 | $ hg amend -m C1 |
|
260 | 295 | $ hg tag --local C1 |
|
261 | 296 | $ hg debugobsolete $(hg log -T '{node}' -r C1) |
General Comments 0
You need to be logged in to leave comments.
Login now