Mercurial > evolve
diff tests/test-obsolete.t @ 2834:38db1466c6fb
log: unstable was renamed into orphan
Unstable was renamed into orphan, update tests.
Match 03039ff3082b mercurial changeset.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 10 Aug 2017 17:37:31 +0200 |
parents | 08a64770ed24 |
children | 20c2499ce8bc |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Aug 10 17:31:23 2017 +0200 +++ b/tests/test-obsolete.t Thu Aug 10 17:37:31 2017 +0200 @@ -175,7 +175,7 @@ $ hg push ../other-new pushing to ../other-new searching for changes - abort: push includes unstable changeset: a7a6f2b5d8a5! + abort: push includes orphan changeset: a7a6f2b5d8a5! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] $ hg push -f ../other-new @@ -230,7 +230,7 @@ $ hg push ../other-new pushing to ../other-new searching for changes - abort: push includes unstable changeset: 95de7fc6918d! + abort: push includes orphan changeset: 95de7fc6918d! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] $ hg push ../other-new -f # use f because there is unstability @@ -397,7 +397,7 @@ commit: 1 deleted, 2 unknown (clean) update: 2 new changesets, 2 branch heads (merge) phases: 4 draft - unstable: 1 changesets + orphan: 1 changesets $ qlog 6 - 909a0fb57e5d @@ -734,7 +734,7 @@ | parent: 2:4538525df7e2 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: unstable + | instability: orphan | summary: add obsol_d'' | | o changeset: 16:50f11e5e3a63