Mercurial > hg
comparison tests/test-split.t @ 47070:d90f6237b3aa
rewriteutil: say how many commits would become orphan if commit is rewritten
This copies the message from the evolve extension, but modifies it a
bit to work with the grammar (in particular with the use of "change
branch of" as `action`). I don't know why it doesn't use the same
`_formatrevs()` as for public commmits.
Differential Revision: https://phab.mercurial-scm.org/D10671
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 04 May 2021 10:49:32 -0700 |
parents | 5b6dd0d9171b |
children | 27fd12eca557 |
comparison
equal
deleted
inserted
replaced
47069:5b6dd0d9171b | 47070:d90f6237b3aa |
---|---|
464 Split a non-head without rebase | 464 Split a non-head without rebase |
465 | 465 |
466 $ cd $TESTTMP/d | 466 $ cd $TESTTMP/d |
467 #if obsstore-off | 467 #if obsstore-off |
468 $ runsplit -r 1 --no-rebase | 468 $ runsplit -r 1 --no-rebase |
469 abort: cannot split changeset with children | 469 abort: cannot split changeset, as that will orphan 3 descendants |
470 (see 'hg help evolution.instability') | 470 (see 'hg help evolution.instability') |
471 [10] | 471 [10] |
472 #else | 472 #else |
473 $ runsplit -r 1 --no-rebase >/dev/null | 473 $ runsplit -r 1 --no-rebase >/dev/null |
474 3 new orphan changesets | 474 3 new orphan changesets |
516 > EOS | 516 > EOS |
517 2 new orphan changesets | 517 2 new orphan changesets |
518 $ eval `hg tags -T '{tag}={node}\n'` | 518 $ eval `hg tags -T '{tag}={node}\n'` |
519 $ rm .hg/localtags | 519 $ rm .hg/localtags |
520 $ hg split $B --config experimental.evolution=createmarkers | 520 $ hg split $B --config experimental.evolution=createmarkers |
521 abort: cannot split changeset with children | 521 abort: cannot split changeset, as that will orphan 4 descendants |
522 (see 'hg help evolution.instability') | 522 (see 'hg help evolution.instability') |
523 [10] | 523 [10] |
524 $ cat > $TESTTMP/messages <<EOF | 524 $ cat > $TESTTMP/messages <<EOF |
525 > Split B | 525 > Split B |
526 > EOF | 526 > EOF |