Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 47069:5b6dd0d9171b
rewriteutil: give examples of public changesets that can't be rewritten
This patch copies the feature from the evolve extension.
Differential Revision: https://phab.mercurial-scm.org/D10670
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 04 May 2021 10:16:34 -0700 |
| parents | 7a90fddb13b0 |
| children | d90f6237b3aa |
comparison
equal
deleted
inserted
replaced
| 47060:fde5bb5d1acf | 47069:5b6dd0d9171b |
|---|---|
| 326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | 326 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 |
| 327 $ hg rebase -d 0 -b 6 | 327 $ hg rebase -d 0 -b 6 |
| 328 nothing to rebase | 328 nothing to rebase |
| 329 [1] | 329 [1] |
| 330 $ hg rebase -d 5 -b 6 | 330 $ hg rebase -d 5 -b 6 |
| 331 abort: cannot rebase public changesets | 331 abort: cannot rebase public changesets: e1c4361dd923 |
| 332 (see 'hg help phases' for details) | 332 (see 'hg help phases' for details) |
| 333 [10] | 333 [10] |
| 334 $ hg rebase -d 5 -r '1 + (6::)' | 334 $ hg rebase -d 5 -r '1 + (6::)' |
| 335 abort: cannot rebase public changesets | 335 abort: cannot rebase public changesets: e1c4361dd923 |
| 336 (see 'hg help phases' for details) | 336 (see 'hg help phases' for details) |
| 337 [10] | 337 [10] |
| 338 | 338 |
| 339 $ hg rebase -d 5 -b 6 --keep | 339 $ hg rebase -d 5 -b 6 --keep |
| 340 rebasing 6:e1c4361dd923 "C" | 340 rebasing 6:e1c4361dd923 "C" |