Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 45853:b4694ef45db5
errors: raise more specific errors from rewriteutil
Differential Revision: https://phab.mercurial-scm.org/D9330
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 16 Nov 2020 15:11:51 -0800 |
| parents | f90a5c211251 |
| children | 9989a276712f |
comparison
equal
deleted
inserted
replaced
| 45852:b56feaa9b520 | 45853:b4694ef45db5 |
|---|---|
| 325 | 325 |
| 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 abort: cannot rebase public changesets | 328 abort: cannot rebase public changesets |
| 329 (see 'hg help phases' for details) | 329 (see 'hg help phases' for details) |
| 330 [255] | 330 [10] |
| 331 $ hg rebase -d 5 -b 6 | 331 $ hg rebase -d 5 -b 6 |
| 332 abort: cannot rebase public changesets | 332 abort: cannot rebase public changesets |
| 333 (see 'hg help phases' for details) | 333 (see 'hg help phases' for details) |
| 334 [255] | 334 [10] |
| 335 $ hg rebase -d 5 -r '1 + (6::)' | 335 $ hg rebase -d 5 -r '1 + (6::)' |
| 336 abort: cannot rebase public changesets | 336 abort: cannot rebase public changesets |
| 337 (see 'hg help phases' for details) | 337 (see 'hg help phases' for details) |
| 338 [255] | 338 [10] |
| 339 | 339 |
| 340 $ hg rebase -d 5 -b 6 --keep | 340 $ hg rebase -d 5 -b 6 --keep |
| 341 rebasing 6:e1c4361dd923 "C" | 341 rebasing 6:e1c4361dd923 "C" |
| 342 rebasing 7:c9659aac0000 tip "D" | 342 rebasing 7:c9659aac0000 tip "D" |
| 343 | 343 |
| 453 $ hg clone -q -u . ah ah1 | 453 $ hg clone -q -u . ah ah1 |
| 454 $ cd ah1 | 454 $ cd ah1 |
| 455 $ hg rebase -r '2::8' -d 1 | 455 $ hg rebase -r '2::8' -d 1 |
| 456 abort: cannot rebase changeset with children | 456 abort: cannot rebase changeset with children |
| 457 (use --keep to keep original changesets) | 457 (use --keep to keep original changesets) |
| 458 [255] | 458 [10] |
| 459 $ hg rebase -r '2::8' -d 1 -k | 459 $ hg rebase -r '2::8' -d 1 -k |
| 460 rebasing 2:c9e50f6cdc55 "C" | 460 rebasing 2:c9e50f6cdc55 "C" |
| 461 rebasing 3:ffd453c31098 "D" | 461 rebasing 3:ffd453c31098 "D" |
| 462 rebasing 6:3d8a618087a7 "G" | 462 rebasing 6:3d8a618087a7 "G" |
| 463 rebasing 7:72434a4e60b0 "H" | 463 rebasing 7:72434a4e60b0 "H" |
| 499 $ hg clone -q -u . ah ah2 | 499 $ hg clone -q -u . ah ah2 |
| 500 $ cd ah2 | 500 $ cd ah2 |
| 501 $ hg rebase -r '3::8' -d 1 | 501 $ hg rebase -r '3::8' -d 1 |
| 502 abort: cannot rebase changeset with children | 502 abort: cannot rebase changeset with children |
| 503 (use --keep to keep original changesets) | 503 (use --keep to keep original changesets) |
| 504 [255] | 504 [10] |
| 505 $ hg rebase -r '3::8' -d 1 --keep | 505 $ hg rebase -r '3::8' -d 1 --keep |
| 506 rebasing 3:ffd453c31098 "D" | 506 rebasing 3:ffd453c31098 "D" |
| 507 rebasing 6:3d8a618087a7 "G" | 507 rebasing 6:3d8a618087a7 "G" |
| 508 rebasing 7:72434a4e60b0 "H" | 508 rebasing 7:72434a4e60b0 "H" |
| 509 rebasing 8:479ddb54a924 tip "I" | 509 rebasing 8:479ddb54a924 tip "I" |
| 542 $ hg clone -q -u . ah ah3 | 542 $ hg clone -q -u . ah ah3 |
| 543 $ cd ah3 | 543 $ cd ah3 |
| 544 $ hg rebase -r '3::7' -d 1 | 544 $ hg rebase -r '3::7' -d 1 |
| 545 abort: cannot rebase changeset with children | 545 abort: cannot rebase changeset with children |
| 546 (use --keep to keep original changesets) | 546 (use --keep to keep original changesets) |
| 547 [255] | 547 [10] |
| 548 $ hg rebase -r '3::7' -d 1 --keep | 548 $ hg rebase -r '3::7' -d 1 --keep |
| 549 rebasing 3:ffd453c31098 "D" | 549 rebasing 3:ffd453c31098 "D" |
| 550 rebasing 6:3d8a618087a7 "G" | 550 rebasing 6:3d8a618087a7 "G" |
| 551 rebasing 7:72434a4e60b0 "H" | 551 rebasing 7:72434a4e60b0 "H" |
| 552 $ hg tglog | 552 $ hg tglog |
| 582 $ hg clone -q -u . ah ah4 | 582 $ hg clone -q -u . ah ah4 |
| 583 $ cd ah4 | 583 $ cd ah4 |
| 584 $ hg rebase -r '3::(7+5)' -d 1 | 584 $ hg rebase -r '3::(7+5)' -d 1 |
| 585 abort: cannot rebase changeset with children | 585 abort: cannot rebase changeset with children |
| 586 (use --keep to keep original changesets) | 586 (use --keep to keep original changesets) |
| 587 [255] | 587 [10] |
| 588 $ hg rebase -r '3::(7+5)' -d 1 --keep | 588 $ hg rebase -r '3::(7+5)' -d 1 --keep |
| 589 rebasing 3:ffd453c31098 "D" | 589 rebasing 3:ffd453c31098 "D" |
| 590 rebasing 4:c01897464e7f "E" | 590 rebasing 4:c01897464e7f "E" |
| 591 rebasing 5:41bfcc75ed73 "F" | 591 rebasing 5:41bfcc75ed73 "F" |
| 592 rebasing 6:3d8a618087a7 "G" | 592 rebasing 6:3d8a618087a7 "G" |