Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t Tue Nov 17 19:29:08 2020 +0900 +++ b/tests/test-rebase-scenario-global.t Mon Nov 16 15:11:51 2020 -0800 @@ -327,15 +327,15 @@ $ hg rebase -d 0 -b 6 abort: cannot rebase public changesets (see 'hg help phases' for details) - [255] + [10] $ hg rebase -d 5 -b 6 abort: cannot rebase public changesets (see 'hg help phases' for details) - [255] + [10] $ hg rebase -d 5 -r '1 + (6::)' abort: cannot rebase public changesets (see 'hg help phases' for details) - [255] + [10] $ hg rebase -d 5 -b 6 --keep rebasing 6:e1c4361dd923 "C" @@ -455,7 +455,7 @@ $ hg rebase -r '2::8' -d 1 abort: cannot rebase changeset with children (use --keep to keep original changesets) - [255] + [10] $ hg rebase -r '2::8' -d 1 -k rebasing 2:c9e50f6cdc55 "C" rebasing 3:ffd453c31098 "D" @@ -501,7 +501,7 @@ $ hg rebase -r '3::8' -d 1 abort: cannot rebase changeset with children (use --keep to keep original changesets) - [255] + [10] $ hg rebase -r '3::8' -d 1 --keep rebasing 3:ffd453c31098 "D" rebasing 6:3d8a618087a7 "G" @@ -544,7 +544,7 @@ $ hg rebase -r '3::7' -d 1 abort: cannot rebase changeset with children (use --keep to keep original changesets) - [255] + [10] $ hg rebase -r '3::7' -d 1 --keep rebasing 3:ffd453c31098 "D" rebasing 6:3d8a618087a7 "G" @@ -584,7 +584,7 @@ $ hg rebase -r '3::(7+5)' -d 1 abort: cannot rebase changeset with children (use --keep to keep original changesets) - [255] + [10] $ hg rebase -r '3::(7+5)' -d 1 --keep rebasing 3:ffd453c31098 "D" rebasing 4:c01897464e7f "E"