Mercurial > evolve
changeset 2833:08a64770ed24
log: trouble was renamed into instability
Trouble was renamed into instability, update tests.
Match 6f4bc9688ca9 mercurial changeset.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 10 Aug 2017 17:31:23 +0200 |
parents | 07b9fcf8b6d3 |
children | 38db1466c6fb |
files | tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-topic-tutorial.t tests/test-topic.t |
diffstat | 8 files changed, 29 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-evolve-obshistory-complex.t Thu Aug 10 17:31:23 2017 +0200 @@ -80,14 +80,14 @@ | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: fold2 | | o changeset: 8:d15d0ffc75f6 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fold1 | | | | o changeset: 7:b868bc49b0a4 @@ -236,27 +236,27 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: fold2 | | o changeset: 13:d0f33db50670 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fold1 | | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fold1 | | | | o changeset: 11:e036916b63ea @@ -312,21 +312,21 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: fold2 | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fold1 | | | | o changeset: 10:19e14c8397fc
--- a/tests/test-evolve-obshistory.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-evolve-obshistory.t Thu Aug 10 17:31:23 2017 +0200 @@ -996,14 +996,14 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent + | instability: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent + | instability: divergent | summary: A1 | | x changeset: 1:471f378eab4c
--- a/tests/test-evolve-templates.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-evolve-templates.t Thu Aug 10 17:31:23 2017 +0200 @@ -625,14 +625,14 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent + | instability: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: divergent + | instability: divergent | summary: A1 | | x changeset: 1:471f378eab4c
--- a/tests/test-obsolete.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-obsolete.t Thu Aug 10 17:31:23 2017 +0200 @@ -592,7 +592,7 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: bumped + instability: bumped summary: add obsol_d''' $ hg push ../other-new/ @@ -622,7 +622,7 @@ |/ parent: 10:2033b4e49474 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: bumped + | instability: bumped | summary: add obsol_d''' | | o changeset: 11:9468a5f5d8b2 @@ -686,7 +686,7 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: bumped, divergent + instability: bumped, divergent summary: add obsol_d''' changeset: 16:50f11e5e3a63 @@ -694,7 +694,7 @@ parent: 11:9468a5f5d8b2 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: divergent + instability: divergent summary: add obsolet_conflicting_d @@ -734,14 +734,14 @@ | parent: 2:4538525df7e2 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | trouble: unstable + | instability: unstable | summary: add obsol_d'' | | o changeset: 16:50f11e5e3a63 | | parent: 11:9468a5f5d8b2 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: divergent + | | instability: divergent | | summary: add obsolet_conflicting_d | | | | o changeset: 15:705ab2a6b72e @@ -767,7 +767,7 @@ | | |/ parent: 10:2033b4e49474 | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 - | | | trouble: bumped, divergent + | | | instability: bumped, divergent | | | summary: add obsol_d''' | | | | o | changeset: 11:9468a5f5d8b2
--- a/tests/test-stabilize-conflict.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-stabilize-conflict.t Thu Aug 10 17:31:23 2017 +0200 @@ -145,7 +145,7 @@ | o changeset: 5:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: babar count up to fifteen | | | x changeset: 4:5977072d13c5 @@ -237,7 +237,7 @@ | o changeset: 8:1836b91c6c1d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: babar count up to fifteen | | | x changeset: 7:e04690b09bc6
--- a/tests/test-stabilize-order.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-stabilize-order.t Thu Aug 10 17:31:23 2017 +0200 @@ -208,13 +208,13 @@ | | parent: 12:2256dae6521f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: secondambiguous | | | | o changeset: 13:bdc003b6eec2 | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: firstambiguous | | | x changeset: 12:2256dae6521f
--- a/tests/test-topic-tutorial.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-topic-tutorial.t Thu Aug 10 17:31:23 2017 +0200 @@ -687,14 +687,14 @@ | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: Adding drill | | | o changeset: 14:d4f97f32f8a1 | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: Adding saw | | | x changeset: 13:a8ab3599d53d
--- a/tests/test-topic.t Wed Aug 09 16:01:20 2017 +0200 +++ b/tests/test-topic.t Thu Aug 10 17:31:23 2017 +0200 @@ -587,7 +587,7 @@ | @ changeset: 10:4073470c35e1 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fran? | | @@ -612,7 +612,7 @@ changeset: 12:18b70b8de1f0 user: test date: Thu Jan 01 00:00:00 1970 +0000 - trouble: unstable + instability: unstable summary: fran? $ hg sum @@ -637,7 +637,7 @@ | @ changeset: 12:18b70b8de1f0 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | trouble: unstable + | | instability: unstable | | summary: fran? | |