Mercurial > evolve
diff tests/test-evolve.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 | c0921b5277a0 a02dc487c452 |
line wrap: on
line diff
--- a/tests/test-evolve.t Tue Oct 12 10:40:40 2021 +0300 +++ b/tests/test-evolve.t Sun Oct 10 10:52:01 2021 +0300 @@ -148,7 +148,7 @@ $ hg prune 1 abort: cannot prune public changesets: 7c3bad9141dc (see 'hg help phases' for details) - [10] + [255] $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' 1 public @@ -1261,9 +1261,9 @@ $ hg up 274b6cd0c101^ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg uncommit --all - abort: cannot uncommit changeset, as that will orphan 4 descendants + abort: uncommit will orphan 4 descendants (see 'hg help evolution.instability') - [10] + [255] $ hg up 274b6cd0c101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg uncommit --all @@ -1318,13 +1318,13 @@ $ mkcommit c5_ created new head $ hg prune '0ef9ff75f8e2 + f1b85956c48c' - abort: cannot prune changeset, as that will orphan 1 descendants + abort: prune will orphan 1 descendants (see 'hg help evolution.instability') - [10] + [255] $ hg prune '98e171e2f272::0d9203b74542' - abort: cannot prune changeset, as that will orphan 1 descendants + abort: prune will orphan 1 descendants (see 'hg help evolution.instability') - [10] + [255] $ hg prune '0ef9ff75f8e2::' 3 changesets pruned $ glog -r "0cf3707e8971::"