Mercurial > hg
diff tests/test-absorb.t @ 45878:f4a218331ff4
errors: raise InputError in `hg absorb`
Differential Revision: https://phab.mercurial-scm.org/D9340
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 17 Nov 2020 16:23:57 -0800 |
parents | 0a330055340c |
children |
line wrap: on
line diff
--- a/tests/test-absorb.t Thu Oct 22 14:14:59 2020 -0700 +++ b/tests/test-absorb.t Tue Nov 17 16:23:57 2020 -0800 @@ -19,7 +19,7 @@ $ hg absorb abort: no mutable changeset to change - [255] + [10] Make some commits: @@ -229,7 +229,7 @@ $ sedi 's/Insert/insert/' a $ hg absorb --apply-changes abort: no mutable changeset to change - [255] + [10] Make working copy clean: @@ -267,7 +267,7 @@ $ echo 2 >> m2 $ hg absorb --apply-changes abort: cannot absorb into a merge - [255] + [10] $ hg revert -q -C m1 m2 Use a new repo: