Show More
@@ -54,7 +54,10 b" def precheck(repo, revs, action=b'rewrit" | |||
|
54 | 54 | |
|
55 | 55 | newunstable = disallowednewunstable(repo, revs) |
|
56 | 56 | if newunstable: |
|
57 | raise error.InputError(_(b"cannot %s changeset with children") % action) | |
|
57 | hint = _(b"see 'hg help evolution.instability'") | |
|
58 | raise error.InputError( | |
|
59 | _(b"cannot %s changeset with children") % action, hint=hint | |
|
60 | ) | |
|
58 | 61 | |
|
59 | 62 | |
|
60 | 63 | def disallowednewunstable(repo, revs): |
@@ -197,6 +197,7 b' Amend in the middle of a stack' | |||
|
197 | 197 | $ echo 2 >> B |
|
198 | 198 | $ hg amend |
|
199 | 199 | abort: cannot amend changeset with children |
|
200 | (see 'hg help evolution.instability') | |
|
200 | 201 | [10] |
|
201 | 202 | |
|
202 | 203 | #if obsstore-on |
@@ -58,6 +58,7 b' Change in middle of the stack (linear co' | |||
|
58 | 58 | |
|
59 | 59 | $ hg branch -r 1::3 foo |
|
60 | 60 | abort: cannot change branch of changeset with children |
|
61 | (see 'hg help evolution.instability') | |
|
61 | 62 | [10] |
|
62 | 63 | |
|
63 | 64 | Change with dirty working directory |
@@ -129,6 +130,7 b' Changing on a branch head which is not t' | |||
|
129 | 130 | |
|
130 | 131 | $ hg branch -r 2 stable |
|
131 | 132 | abort: cannot change branch of changeset with children |
|
133 | (see 'hg help evolution.instability') | |
|
132 | 134 | [10] |
|
133 | 135 | |
|
134 | 136 | Enabling the allowunstable config and trying to change branch on a branch head |
@@ -1173,6 +1173,7 b' an orphan. We must respect experimental.' | |||
|
1173 | 1173 | $ hg commit -m "second" |
|
1174 | 1174 | $ hg --config experimental.evolution.allowunstable=False fix -r '.^' |
|
1175 | 1175 | abort: cannot fix changeset with children |
|
1176 | (see 'hg help evolution.instability') | |
|
1176 | 1177 | [10] |
|
1177 | 1178 | $ hg fix -r '.^' |
|
1178 | 1179 | 1 new orphan changesets |
@@ -550,7 +550,7 b' Test collapsing a middle revision in-pla' | |||
|
550 | 550 | |
|
551 | 551 | $ hg rebase --collapse -r 1 -d 0 |
|
552 | 552 | abort: cannot rebase changeset with children |
|
553 | (use --keep to keep original changesets) | |
|
553 | (see 'hg help evolution.instability') | |
|
554 | 554 | [10] |
|
555 | 555 | |
|
556 | 556 | Test collapsing in place |
@@ -453,7 +453,7 b' Source on have two descendant heads but ' | |||
|
453 | 453 | $ cd ah1 |
|
454 | 454 | $ hg rebase -r '2::8' -d 1 |
|
455 | 455 | abort: cannot rebase changeset with children |
|
456 | (use --keep to keep original changesets) | |
|
456 | (see 'hg help evolution.instability') | |
|
457 | 457 | [10] |
|
458 | 458 | $ hg rebase -r '2::8' -d 1 -k |
|
459 | 459 | rebasing 2:c9e50f6cdc55 "C" |
@@ -499,7 +499,7 b' Base on have one descendant heads we ask' | |||
|
499 | 499 | $ cd ah2 |
|
500 | 500 | $ hg rebase -r '3::8' -d 1 |
|
501 | 501 | abort: cannot rebase changeset with children |
|
502 | (use --keep to keep original changesets) | |
|
502 | (see 'hg help evolution.instability') | |
|
503 | 503 | [10] |
|
504 | 504 | $ hg rebase -r '3::8' -d 1 --keep |
|
505 | 505 | rebasing 3:ffd453c31098 "D" |
@@ -542,7 +542,7 b' rebase subset' | |||
|
542 | 542 | $ cd ah3 |
|
543 | 543 | $ hg rebase -r '3::7' -d 1 |
|
544 | 544 | abort: cannot rebase changeset with children |
|
545 | (use --keep to keep original changesets) | |
|
545 | (see 'hg help evolution.instability') | |
|
546 | 546 | [10] |
|
547 | 547 | $ hg rebase -r '3::7' -d 1 --keep |
|
548 | 548 | rebasing 3:ffd453c31098 "D" |
@@ -582,7 +582,7 b' rebase subset with multiple head' | |||
|
582 | 582 | $ cd ah4 |
|
583 | 583 | $ hg rebase -r '3::(7+5)' -d 1 |
|
584 | 584 | abort: cannot rebase changeset with children |
|
585 | (use --keep to keep original changesets) | |
|
585 | (see 'hg help evolution.instability') | |
|
586 | 586 | [10] |
|
587 | 587 | $ hg rebase -r '3::(7+5)' -d 1 --keep |
|
588 | 588 | rebasing 3:ffd453c31098 "D" |
@@ -467,6 +467,7 b' Split a non-head without rebase' | |||
|
467 | 467 | #if obsstore-off |
|
468 | 468 | $ runsplit -r 1 --no-rebase |
|
469 | 469 | abort: cannot split changeset with children |
|
470 | (see 'hg help evolution.instability') | |
|
470 | 471 | [10] |
|
471 | 472 | #else |
|
472 | 473 | $ runsplit -r 1 --no-rebase >/dev/null |
@@ -518,6 +519,7 b' Split a non-head with obsoleted descenda' | |||
|
518 | 519 | $ rm .hg/localtags |
|
519 | 520 | $ hg split $B --config experimental.evolution=createmarkers |
|
520 | 521 | abort: cannot split changeset with children |
|
522 | (see 'hg help evolution.instability') | |
|
521 | 523 | [10] |
|
522 | 524 | $ cat > $TESTTMP/messages <<EOF |
|
523 | 525 | > Split B |
General Comments 0
You need to be logged in to leave comments.
Login now