Mercurial > evolve
diff tests/test-metaedit.t @ 6063:1a13ac9ef30a mercurial-5.8
test-compat: back out test changes from 65d4e47d7f26
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 10 Oct 2021 10:52:01 +0300 |
parents | 65d4e47d7f26 |
children | 55e9987b8384 1328195f76a9 |
line wrap: on
line diff
--- a/tests/test-metaedit.t Tue Oct 12 10:40:40 2021 +0300 +++ b/tests/test-metaedit.t Sun Oct 10 10:52:01 2021 +0300 @@ -74,7 +74,7 @@ $ hg metaedit -r 0 --fold abort: cannot fold public changesets: ea207398892e (see 'hg help phases' for details) - [10] + [255] $ hg metaedit 'desc(C) + desc(F)' --fold abort: cannot fold non-linear revisions (multiple roots given) [255] @@ -87,9 +87,9 @@ (587528abfffe will become unstable and new unstable changes are not allowed) [255] $ hg metaedit 'desc(A)::desc(B)' --fold --config 'experimental.evolution=createmarkers, allnewcommands' - abort: cannot fold changeset, as that will orphan 4 descendants + abort: fold will orphan 4 descendants (see 'hg help evolution.instability') - [10] + [255] $ hg metaedit --user foobar 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden