Mercurial > public > mercurial-scm > hg
diff tests/test-branch-change.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 | f96fa4de5055 |
| children | 95c4cca641f6 |
line wrap: on
line diff
--- a/tests/test-branch-change.t Tue Nov 17 19:29:08 2020 +0900 +++ b/tests/test-branch-change.t Mon Nov 16 15:11:51 2020 -0800 @@ -58,7 +58,7 @@ $ hg branch -r 1::3 foo abort: cannot change branch of changeset with children - [255] + [10] Change with dirty working directory @@ -129,7 +129,7 @@ $ hg branch -r 2 stable abort: cannot change branch of changeset with children - [255] + [10] Enabling the allowunstable config and trying to change branch on a branch head which is not a topological head @@ -368,7 +368,7 @@ $ hg branch -r . def abort: cannot change branch of public changesets (see 'hg help phases' for details) - [255] + [10] Merge commit with conflicts, with evolution and without