Mercurial > evolve
diff tests/test-obsolete.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 26 Jun 2024 18:09:37 +0400 |
parents | 1328195f76a9 |
children | b1d010b2e6c4 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Wed Jun 26 16:24:32 2024 +0400 +++ b/tests/test-obsolete.t Wed Jun 26 18:09:37 2024 +0400 @@ -170,7 +170,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 @@ -310,7 +310,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