equal
deleted
inserted
replaced
403 |
403 |
404 fold aborts here because divergence is not allowed |
404 fold aborts here because divergence is not allowed |
405 |
405 |
406 $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \ |
406 $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \ |
407 > --config experimental.evolution.allowdivergence=no |
407 > --config experimental.evolution.allowdivergence=no |
408 abort: folding obsolete revisions may cause divergence |
408 abort: fold of 4b34ecfb0d56 creates content-divergence with fcfd42a7fa46 |
409 (set experimental.evolution.allowdivergence=yes to allow folding them) |
409 (add --verbose for details or see 'hg help evolution.instability') |
410 [255] |
410 [255] |
411 |
411 |
412 but if we allow divergence, this should work and should create new content-divergent changesets |
412 but if we allow divergence, this should work and should create new content-divergent changesets |
413 |
413 |
414 $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \ |
414 $ hg fold --exact -r 'desc("A")::desc("B")' -m 'second fold' \ |