Mercurial > evolve
diff tests/test-obsolete.t @ 2836:feaa52680682
log: bumped was renamed into phasedivergent
Bumped was renamed into phasedivergent, update tests.
Match 9c27a2891b75 mercurial changeset.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 10 Aug 2017 19:31:55 +0200 |
parents | 20c2499ce8bc |
children | 2b8b960a04ee |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Aug 10 17:57:50 2017 +0200 +++ b/tests/test-obsolete.t Thu Aug 10 19:31:55 2017 +0200 @@ -592,13 +592,13 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - instability: bumped + instability: phase-divergent summary: add obsol_d''' $ hg push ../other-new/ pushing to ../other-new/ searching for changes - abort: push includes bumped changeset: 6db5e282cb91! + abort: push includes phase-divergent changeset: 6db5e282cb91! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] @@ -622,7 +622,7 @@ |/ parent: 10:2033b4e49474 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: bumped + | instability: phase-divergent | summary: add obsol_d''' | | o changeset: 11:9468a5f5d8b2 @@ -679,14 +679,14 @@ commit: (clean) update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) phases: 3 draft - bumped: 1 changesets + phase-divergent: 1 changesets $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` $ hg log -r 'divergent()' changeset: 12:6db5e282cb91 parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - instability: bumped, content-divergent + instability: phase-divergent, content-divergent summary: add obsol_d''' changeset: 16:50f11e5e3a63 @@ -767,7 +767,7 @@ | | |/ parent: 10:2033b4e49474 | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 - | | | instability: bumped, content-divergent + | | | instability: phase-divergent, content-divergent | | | summary: add obsol_d''' | | | | o | changeset: 11:9468a5f5d8b2