Mercurial > hg > evolve
changeset 3193:90f25253e6f6 mercurial-4.3
backout phase rename
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 16:25:36 +0200 |
parents | dd8eeafd94bf |
children | |
files | tests/test-divergent.t tests/test-evolve-list.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-obsolete.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-topic-stack-data.t tests/test-topic-tutorial.t tests/test-tutorial.t tests/test-uncommit.t |
diffstat | 14 files changed, 59 insertions(+), 59 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-divergent.t +++ b/tests/test-divergent.t @@ -47,9 +47,9 @@ 1 changesets pruned 2 new content-divergent changesets $ hg log -G - @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] + @ 3:e708fd28d5cf@default(draft) add bdivergent2 [divergent] | - | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] + | o 2:c2f698071cba@default(draft) add bdivergent1 [divergent] |/ o 0:135f39f4bd78@default(draft) add _a [] @@ -90,9 +90,9 @@ 1 changesets pruned 2 new content-divergent changesets $ hg log -G - @ 8:0a768ef678d9@default(draft) cdivergent2 [content-divergent] + @ 8:0a768ef678d9@default(draft) cdivergent2 [divergent] | - | o 7:26c7705fee96@default(draft) add cdivergent1 [content-divergent] + | o 7:26c7705fee96@default(draft) add cdivergent1 [divergent] |/ | o 5:c26f1d3baed2@default(draft) add bdivergent1 [] |/ @@ -126,9 +126,9 @@ 1 changesets pruned 2 new content-divergent changesets $ hg log -G - @ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent] + @ 3:e708fd28d5cf@default(draft) add bdivergent2 [divergent] | - | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] + | o 2:c2f698071cba@default(draft) add bdivergent1 [divergent] |/ o 0:135f39f4bd78@default(draft) add _a []
--- a/tests/test-evolve-list.t +++ b/tests/test-evolve-list.t @@ -23,7 +23,7 @@ unstable: cb9a9f314b8b (obsolete parent) 177f92b77385: c - orphan: d2ae7f538514 (orphan parent) + unstable: d2ae7f538514 (unstable parent) $ cd ..
--- a/tests/test-evolve-obshistory-complex.t +++ b/tests/test-evolve-obshistory-complex.t @@ -80,14 +80,14 @@ | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: fold2 | | o changeset: 8:d15d0ffc75f6 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: fold1 | | | | o changeset: 7:b868bc49b0a4 @@ -236,27 +236,27 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: fold2 | | o changeset: 13:d0f33db50670 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: fold1 | | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: fold1 | | | | o changeset: 11:e036916b63ea @@ -312,21 +312,21 @@ | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: fold2 | o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: fold2 | | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: fold1 | | | | o changeset: 10:19e14c8397fc
--- a/tests/test-evolve-obshistory.t +++ b/tests/test-evolve-obshistory.t @@ -1022,14 +1022,14 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c
--- a/tests/test-evolve-templates.t +++ b/tests/test-evolve-templates.t @@ -646,14 +646,14 @@ | parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A2 | | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: content-divergent + | trouble: divergent | summary: A1 | | x changeset: 1:471f378eab4c
--- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -453,9 +453,9 @@ $ hg log -G --template '{rev} {troubles}\n' @ 13 | - | o 11 orphan + | o 11 unstable | | - | o 10 orphan + | o 10 unstable | | | x 9 |/ @@ -971,7 +971,7 @@ $ hg evolve nothing to evolve on current working copy parent - (2 other orphan in the repository, do you want --any or --rev) + (2 other unstable in the repository, do you want --any or --rev) [2] @@ -1312,7 +1312,7 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg evolve --all nothing to evolve on current working copy parent - (2 other orphan in the repository, do you want --any or --rev) + (2 other unstable in the repository, do you want --any or --rev) [2] $ hg evolve --all --any move:[22] add j2
--- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -175,7 +175,7 @@ $ hg push ../other-new pushing to ../other-new searching for changes - abort: push includes orphan changeset: a7a6f2b5d8a5! + abort: push includes unstable 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 orphan changeset: 95de7fc6918d! + abort: push includes unstable 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 - orphan: 1 changesets + unstable: 1 changesets $ qlog 6 - 909a0fb57e5d @@ -592,13 +592,13 @@ parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - instability: phase-divergent + trouble: bumped summary: add obsol_d''' $ hg push ../other-new/ pushing to ../other-new/ searching for changes - abort: push includes phase-divergent changeset: 6db5e282cb91! + abort: push includes bumped 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: phase-divergent + | trouble: bumped | 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 - phase-divergent: 1 changesets + bumped: 1 changesets $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` $ hg log -r 'contentdivergent()' changeset: 12:6db5e282cb91 parent: 10:2033b4e49474 user: test date: Thu Jan 01 00:00:00 1970 +0000 - instability: phase-divergent, content-divergent + trouble: 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 - instability: content-divergent + trouble: divergent summary: add obsolet_conflicting_d @@ -719,7 +719,7 @@ $ hg up --hidden 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) - (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue) $ hg export 9468a5f5d8b2 | hg import - applying patch from stdin 1 new orphan changesets @@ -734,14 +734,14 @@ | parent: 2:4538525df7e2 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | instability: orphan + | trouble: unstable | summary: add obsol_d'' | | o changeset: 16:50f11e5e3a63 | | parent: 11:9468a5f5d8b2 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: content-divergent + | | trouble: 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 - | | | instability: phase-divergent, content-divergent + | | | trouble: bumped, divergent | | | summary: add obsol_d''' | | | | o | changeset: 11:9468a5f5d8b2
--- a/tests/test-stabilize-conflict.t +++ b/tests/test-stabilize-conflict.t @@ -65,7 +65,7 @@ $ safesed 's/huit/eight/' babar $ hg diff diff -r 9d5daf8bd956 babar - --- a/babar * (glob) + --- a/babar Thu Jan 01 00:00:00 1970 +0000 +++ b/babar * (glob) @@ -5,6 +5,6 @@ cinq @@ -114,7 +114,7 @@ $ hg diff diff -r 5977072d13c5 babar --- a/babar Thu Jan 01 00:00:00 1970 +0000 - +++ b/babar Thu Jan 01 00:00:00 1970 +0000 + +++ b/babar * (glob) @@ -7,4 +7,4 @@ sept eight @@ -145,7 +145,7 @@ | o changeset: 5:71c18f70c34f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: 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 - | | instability: orphan + | | trouble: unstable | | summary: babar count up to fifteen | | | x changeset: 7:e04690b09bc6
--- a/tests/test-stabilize-order.t +++ b/tests/test-stabilize-order.t @@ -110,10 +110,10 @@ --- successors.old* (glob) +++ successors.new* (glob) @@ -3,3 +3,4 @@ - 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob) - 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob) - 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob) - +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob) + 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) + 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) + 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob) + +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob) [1] @@ -153,7 +153,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg evolve -v nothing to evolve on current working copy parent - (1 other orphan in the repository, do you want --any or --rev) + (1 other unstable in the repository, do you want --any or --rev) [2] $ hg evolve --any -v move:[9] addc @@ -179,7 +179,7 @@ o 0:c471ef929e6a@default(draft) addroot $ hg evolve --any -v - no orphan changesets to evolve + no unstable changesets to evolve [1] Ambiguous evolution @@ -208,13 +208,13 @@ | | parent: 12:2256dae6521f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: secondambiguous | | | | o changeset: 13:bdc003b6eec2 | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: firstambiguous | | | x changeset: 12:2256dae6521f
--- a/tests/test-stabilize-result.t +++ b/tests/test-stabilize-result.t @@ -159,9 +159,9 @@ $ hg evolve --any --dry-run --phasedivergent recreate:[12] newer a atop:[8] newer a - hg rebase --rev d5c7ef82d003 --dest 66719795a494; + hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) hg update 1cf0aacfd363; - hg revert --all --rev d5c7ef82d003; + hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) hg commit --msg "bumped update to %s" (no-eol) $ hg evolve --any --confirm --phasedivergent recreate:[12] newer a @@ -207,7 +207,7 @@ $ glog @ 15:3932c176bbaa@default(draft) bk:[] More addition | - | o 14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | o | 9:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -234,7 +234,7 @@ | | o 17:d2f173e25686@default(draft) bk:[] More addition |/ - | o 14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | o | 9:7bc2f5967f5e@default(draft) bk:[] add c | | @@ -289,7 +289,7 @@ $ glog @ 21:f344982e63c4@default(draft) bk:[] More addition | - | o 14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: + | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | | o | 9:7bc2f5967f5e@default(draft) bk:[] add c | |
--- a/tests/test-topic-stack-data.t +++ b/tests/test-topic-stack-data.t @@ -111,7 +111,7 @@ commit: (clean) update: 2 new changesets (update) phases: 22 draft - orphan: 3 changesets + unstable: 3 changesets topic: foo $ hg log --graph -T '{desc} ({branch}) [{topic}]' @ add foo_b (lake) []
--- a/tests/test-topic-tutorial.t +++ b/tests/test-topic-tutorial.t @@ -1211,14 +1211,14 @@ | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: Adding drill | | | o changeset: 14:d4f97f32f8a1 | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 - | | instability: orphan + | | trouble: unstable | | summary: Adding saw | | | x changeset: 13:a8ab3599d53d
--- a/tests/test-tutorial.t +++ b/tests/test-tutorial.t @@ -1353,7 +1353,7 @@ $ hg push other pushing to $TESTTMP/other (glob) searching for changes - abort: push includes orphan changeset: bf1b0d202029! + abort: push includes unstable changeset: bf1b0d202029! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255]
--- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -287,7 +287,7 @@ $ hg up -C 3 --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) - (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (5eb72dbe0cb4 has diverged, use 'hg evolve --list --divergent' to resolve the issue) $ hg --config extensions.purge= purge $ hg uncommit --all -X e 1 new content-divergent changesets