Mercurial > evolve
diff tests/test-obsolete.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 24 Apr 2021 20:01:39 +0800 |
parents | 08c30eef85d3 |
children | 669270305ccb c0921b5277a0 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Sat Apr 24 19:54:14 2021 +0800 +++ b/tests/test-obsolete.t Sat Apr 24 20:01:39 2021 +0800 @@ -175,7 +175,7 @@ $ hg init ../other-new $ hg phase --draft 'secret() - extinct()' # until we fix exclusion abort: empty revision set - [10] + [255] $ hg push ../other-new pushing to ../other-new searching for changes @@ -314,7 +314,7 @@ .. $ hg push ../other-old .. pushing to ../other-old .. searching for changes -.. abort: push includes an unstable changeset: 909a0fb57e5d +.. abort: push includes an unstable changeset: 909a0fb57e5d! .. (use 'hg evolve' to get a stable history or --force to ignore warnings) .. [255] .. $ hg push -f ../other-old