--- a/tests/test-evolve-phase-divergence.t Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-phase-divergence.t Thu May 07 01:29:48 2020 +0200
@@ -160,9 +160,9 @@
XXX: There must be mention of phase-divergence here
$ hg obslog -r . --all
@ 98bb3a6cfe1a (2) tweak a
+ | reworded(description) from 4d1169d82e47 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
o 4d1169d82e47 (1) modify a
- reworded(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
Solving the phase divergence using evolve command
--------------------------------------------------
@@ -359,12 +359,12 @@
d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r . --all
@ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
+ | rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
% d47f2b37ed82 (4) added bar to foo
- | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
% aa071e5554e3 (3) added foo to foo
- rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
Syncing all other repositories
@@ -597,9 +597,9 @@
2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
$ hg obslog -r .
@ 334e300d6db5 (10) added x to x
+ | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
|
o 2352021b3785 (9) added x to x
- rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg glog -r .^::
@ 10:334e300d6db5 added x to x
@@ -654,13 +654,13 @@
b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r . b1a0e143e32b --all --hidden
x b1a0e143e32b (11) added x to x
+ | rebased(parent) from 334e300d6db5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 334e300d6db5 (10) added x to x
- | rebased(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
|
@ 2352021b3785 (9) added x to x
- rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg exp
@@ -750,12 +750,12 @@
211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
$ hg obslog -r .
@ 13015a180eee (14) y to y and foobar to foo
+ | amended(content) from 211ab84d1689 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 211ab84d1689 (13) y to y and foobar to foo
- | amended(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rebased(parent) from dc88f5aa9bc9 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
|
o dc88f5aa9bc9 (12) y to y and foobar to foo
- rebased(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
Resolving divergence using `hg evolve`
-------------------------------------
@@ -838,12 +838,12 @@
2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
$ hg obslog -r .
@ 5fd38c0de46e (19) added l to l
+ | amended(content) from 2bfd56949cf0 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 2bfd56949cf0 (18) added l to l
- | amended(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
|
x f3794e5a91dc (17) added l to l
- rebased(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg phase -r f3794e5a91dc --public --hidden
@@ -1079,20 +1079,21 @@
ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r a51bce62c219 --all
o 86419909e017 (4) phase-divergent update to a51bce62c219:
+ | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
| @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219:
+ | | rewritten(description, parent, content) from ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 4f25cd9cd2bf (2) added m
- | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x ee4af146c5cf (5) added n
- | | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rebased(parent) from e1154ec0206a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e1154ec0206a (3) added n
- |/ rebased(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
o a51bce62c219 (1) added m and n
- split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is the correct
@@ -1213,17 +1214,18 @@
bb87595f9a77d7d1e4a8726beef266a1636f63d5 26f564f94bcc34e049eb112fd14ab1e5286f2325 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r 90859808ece6 --all
o 25875a9cb640 (4) phase-divergent update to 90859808ece6:
+ | rewritten(description, parent, content) from a47263294745 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
| @ 26f564f94bcc (5) phase-divergent update to 90859808ece6:
+ | | rewritten(description, parent, content) from bb87595f9a77 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a47263294745 (2) added p
- | | rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x bb87595f9a77 (3) added q
- |/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
o 90859808ece6 (1) added p and q
- split(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is correct
@@ -1350,23 +1352,24 @@
98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
$ hg obslog -r a51bce62c219 --all
o 86419909e017 (5) phase-divergent update to a51bce62c219:
+ | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
|
| @ 88b0dae5369a (7) phase-divergent update to a51bce62c219:
+ | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 4f25cd9cd2bf (2) added m
- | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| % 98dad8812511 (6) added n
- | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x 52ca78bb98c7 (4) added n
- | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x e1154ec0206a (3) added n
- |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
|
% a51bce62c219 (1) added m and n
- split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
XXX: not sure this is correct
@@ -1649,54 +1652,54 @@
3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
$ hg obslog --all --patch
@ 599454370881 (2) E2
+ | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 3074c7249d20 -r 599454370881 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
+ | @@ -1,1 +1,1 @@
+ | -E1
+ | +E2
+ |
+ | diff -r 3074c7249d20 -r 599454370881 letters
+ | --- a/letters Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/letters Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,7 +1,7 @@
+ | a
+ | b
+ | c
+ | -D
+ | +d
+ | e
+ | f
+ | g
+ | diff -r 3074c7249d20 -r 599454370881 numbers
+ | --- a/numbers Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,9 +1,9 @@
+ | 1
+ | 2
+ | 3
+ | -four
+ | +4
+ | 5
+ | 6
+ | -7
+ | +seven
+ | 8
+ | nine
+ | diff -r 3074c7249d20 -r 599454370881 romans
+ | --- a/romans Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/romans Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,5 +1,5 @@
+ | I
+ | -II
+ | +ii
+ | III
+ | IV
+ | V
+ |
|
o 3074c7249d20 (1) E1
- rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- diff -r 3074c7249d20 -r 599454370881 changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,1 +1,1 @@
- -E1
- +E2
-
- diff -r 3074c7249d20 -r 599454370881 letters
- --- a/letters Thu Jan 01 00:00:00 1970 +0000
- +++ b/letters Thu Jan 01 00:00:00 1970 +0000
- @@ -1,7 +1,7 @@
- a
- b
- c
- -D
- +d
- e
- f
- g
- diff -r 3074c7249d20 -r 599454370881 numbers
- --- a/numbers Thu Jan 01 00:00:00 1970 +0000
- +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
- @@ -1,9 +1,9 @@
- 1
- 2
- 3
- -four
- +4
- 5
- 6
- -7
- +seven
- 8
- nine
- diff -r 3074c7249d20 -r 599454370881 romans
- --- a/romans Thu Jan 01 00:00:00 1970 +0000
- +++ b/romans Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,5 @@
- I
- -II
- +ii
- III
- IV
- V
-
$ hg evolve --phase-divergent --rev 'desc("E2")'
@@ -1836,58 +1839,58 @@
59945437088136c5fa2f9bb8573d5d02623fe7cb 9eebcb77a7e2b240cb7dce095bbe608b5de91cc8 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
$ hg obslog --patch
@ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
+ | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | (No patch available, changesets rebased)
|
% 599454370881 (2) E2
- | rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
- | (No patch available, changesets rebased)
+ | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | diff -r 3074c7249d20 -r 599454370881 changeset-description
+ | --- a/changeset-description
+ | +++ b/changeset-description
+ | @@ -1,1 +1,1 @@
+ | -E1
+ | +E2
+ |
+ | diff -r 3074c7249d20 -r 599454370881 letters
+ | --- a/letters Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/letters Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,7 +1,7 @@
+ | a
+ | b
+ | c
+ | -D
+ | +d
+ | e
+ | f
+ | g
+ | diff -r 3074c7249d20 -r 599454370881 numbers
+ | --- a/numbers Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,9 +1,9 @@
+ | 1
+ | 2
+ | 3
+ | -four
+ | +4
+ | 5
+ | 6
+ | -7
+ | +seven
+ | 8
+ | nine
+ | diff -r 3074c7249d20 -r 599454370881 romans
+ | --- a/romans Thu Jan 01 00:00:00 1970 +0000
+ | +++ b/romans Thu Jan 01 00:00:00 1970 +0000
+ | @@ -1,5 +1,5 @@
+ | I
+ | -II
+ | +ii
+ | III
+ | IV
+ | V
+ |
|
% 3074c7249d20 (1) E1
- rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- diff -r 3074c7249d20 -r 599454370881 changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,1 +1,1 @@
- -E1
- +E2
-
- diff -r 3074c7249d20 -r 599454370881 letters
- --- a/letters Thu Jan 01 00:00:00 1970 +0000
- +++ b/letters Thu Jan 01 00:00:00 1970 +0000
- @@ -1,7 +1,7 @@
- a
- b
- c
- -D
- +d
- e
- f
- g
- diff -r 3074c7249d20 -r 599454370881 numbers
- --- a/numbers Thu Jan 01 00:00:00 1970 +0000
- +++ b/numbers Thu Jan 01 00:00:00 1970 +0000
- @@ -1,9 +1,9 @@
- 1
- 2
- 3
- -four
- +4
- 5
- 6
- -7
- +seven
- 8
- nine
- diff -r 3074c7249d20 -r 599454370881 romans
- --- a/romans Thu Jan 01 00:00:00 1970 +0000
- +++ b/romans Thu Jan 01 00:00:00 1970 +0000
- @@ -1,5 +1,5 @@
- I
- -II
- +ii
- III
- IV
- V
-
$ cd ..