diff tests/test-evolve-phase-divergence.t @ 6395:1328195f76a9 mercurial-5.6

test-compat: merge mercurial-5.7 into mercurial-5.6

--- a/tests/test-evolve-phase-divergence.t	Thu Dec 08 20:23:47 2022 +0400
+++ b/tests/test-evolve-phase-divergence.t	Mon Feb 06 19:49:33 2023 +0400
@@ -756,21 +756,21 @@
   recreate:[14] y to y and foobar to foo
   atop:[12] y to y and foobar to foo
   rebasing to destination parent: 2352021b3785
-  committed as 8c2bb6fb44e9
-  working directory is now at 8c2bb6fb44e9
+  committed as ec66af49a1a6
+  working directory is now at ec66af49a1a6
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
+  # Node ID ec66af49a1a643ef308fe11697c59c4920d2bd9e
   # Parent  dc88f5aa9bc90a6418899d267d9524205dfb429b
   phase-divergent update to dc88f5aa9bc9:
   
   y to y and foobar to foo
   
-  diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y
+  diff -r dc88f5aa9bc9 -r ec66af49a1a6 y
   --- a/y	Thu Jan 01 00:00:00 1970 +0000
   +++ b/y	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -778,7 +778,7 @@
   +foo
 
   $ hg glog
-  @  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+  @  16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
   |   () draft
   o  12:dc88f5aa9bc9 y to y and foobar to foo
   |   () public
@@ -806,7 +806,7 @@
   $ echo l > l
   $ hg ci -Aqm "added l to l"
   $ hg rebase -r . -d .^^^^
-  rebasing 17:f3794e5a91dc "added l to l" (tip)
+  rebasing 17:c7c3e834e653 "added l to l" (tip)
   $ echo kl > l
   $ echo foo > x
   $ hg add x
@@ -824,21 +824,21 @@
   b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
   dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
   211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
-  13015a180eee523ba9950f18683762a77f560f3d 7687d2968b3e2697f955beac2da24ee879950cb9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
-  f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
-  2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+  13015a180eee523ba9950f18683762a77f560f3d 7c9c658a311a5194f4826f91ae667b151263d192 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  7c9c658a311a5194f4826f91ae667b151263d192 ec66af49a1a643ef308fe11697c59c4920d2bd9e 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
+  c7c3e834e6538706672e2b5387a27efda6e0f00f 5c0ff97e7b93a7510a08eaf8ae3821448255963d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+  5c0ff97e7b93a7510a08eaf8ae3821448255963d 4c2ba1e0fc47842138814c7e5dc64392bdf2d70e 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)
+  @  4c2ba1e0fc47 (19) added l to l
+  |    amended(content) from 5c0ff97e7b93 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  2bfd56949cf0 (18) added l to l
-  |    rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+  x  5c0ff97e7b93 (18) added l to l
+  |    rebased(parent) from c7c3e834e653 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  x  f3794e5a91dc (17) added l to l
+  x  c7c3e834e653 (17) added l to l
   
 
-  $ hg phase -r f3794e5a91dc --public --hidden
+  $ hg phase -r c7c3e834e653 --public --hidden
   1 new phase-divergent changesets
 
 Resolution using `hg evolve --phase-divergent`
@@ -847,7 +847,7 @@
   $ hg evolve --phase-divergent --update
   recreate:[19] added l to l
   atop:[17] added l to l
-  rebasing to destination parent: 8c2bb6fb44e9
+  rebasing to destination parent: ec66af49a1a6
   merging x
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -855,20 +855,20 @@
   [1]
 
   $ hg diff
-  diff -r 8c2bb6fb44e9 l
+  diff -r ec66af49a1a6 l
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/l	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +kl
-  diff -r 8c2bb6fb44e9 x
+  diff -r ec66af49a1a6 x
   --- a/x	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
+  +<<<<<<< destination: ec66af49a1a6 - test: phase-divergent update to dc88f5aa9...
    x
   +=======
   +foo
-  +>>>>>>> evolving:    5fd38c0de46e - test: added l to l
+  +>>>>>>> evolving:    4c2ba1e0fc47 - test: added l to l
 
   $ echo foo > x
 
@@ -877,16 +877,16 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  evolving 19:5fd38c0de46e "added l to l"
-  committed as e3090241a10c
-  working directory is now at e3090241a10c
+  evolving 19:4c2ba1e0fc47 "added l to l"
+  committed as 4a3e0e3f88ca
+  working directory is now at 4a3e0e3f88ca
 
   $ hg glog
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () draft
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
-  o  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+  o  16:ec66af49a1a6 phase-divergent update to dc88f5aa9bc9:
   |   () public
   o  12:dc88f5aa9bc9 y to y and foobar to foo
   |   () public
@@ -910,19 +910,19 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID e3090241a10c320b6132e4673915fd6b19c0de39
-  # Parent  f3794e5a91dc1d4d36fee5c423386b19433a1f48
-  phase-divergent update to f3794e5a91dc:
+  # Node ID 4a3e0e3f88ca7c24f3b9f54abfbb49a314fe4c0b
+  # Parent  c7c3e834e6538706672e2b5387a27efda6e0f00f
+  phase-divergent update to c7c3e834e653:
   
   added l to l
   
-  diff -r f3794e5a91dc -r e3090241a10c l
+  diff -r c7c3e834e653 -r 4a3e0e3f88ca l
   --- a/l	Thu Jan 01 00:00:00 1970 +0000
   +++ b/l	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -l
   +kl
-  diff -r f3794e5a91dc -r e3090241a10c x
+  diff -r c7c3e834e653 -r 4a3e0e3f88ca x
   --- a/x	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -933,7 +933,7 @@
 ------------------------------------------------------------------------
 
   $ hg glog -r .
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () draft
   ~
   $ echo f > f
@@ -947,44 +947,44 @@
 
   $ hg evolve --list
 
-  $ hg phase -r 428f7900a969 --public --hidden
+  $ hg phase -r 898734e41932 --public --hidden
   1 new phase-divergent changesets
 
-  $ hg glog -r f3794e5a91dc::
-  @  24:390acb97e50a added f
+  $ hg glog -r c7c3e834e653::
+  @  24:5dfcf4a7c095 added f
   |   () draft
-  | o  23:428f7900a969 added g
+  | o  23:898734e41932 added g
   | |   () public
-  | o  22:21ae52e414e6 added f
+  | o  22:54c60ee8ecb8 added f
   |/    () public
-  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  o  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () public
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
   ~
 
   $ hg evolve --list
-  390acb97e50a: added f
-    phase-divergent: 21ae52e414e6 (immutable precursor)
-    phase-divergent: 428f7900a969 (immutable precursor)
+  5dfcf4a7c095: added f
+    phase-divergent: 54c60ee8ecb8 (immutable precursor)
+    phase-divergent: 898734e41932 (immutable precursor)
   
 Resolving phase divergence using `hg evolve`
 
   $ hg evolve --phase-divergent --all
   recreate:[24] added f
   atop:[23] added g
-  rebasing to destination parent: 21ae52e414e6
+  rebasing to destination parent: 54c60ee8ecb8
   no changes to commit
-  working directory is now at e3090241a10c
+  working directory is now at 4a3e0e3f88ca
 
-  $ hg glog -r f3794e5a91dc::
-  o  23:428f7900a969 added g
+  $ hg glog -r c7c3e834e653::
+  o  23:898734e41932 added g
   |   () public
-  o  22:21ae52e414e6 added f
+  o  22:54c60ee8ecb8 added f
   |   () public
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:4a3e0e3f88ca phase-divergent update to c7c3e834e653:
   |   () public
-  o  17:f3794e5a91dc added l to l
+  o  17:c7c3e834e653 added l to l
   |   () public
   ~
 
@@ -1315,13 +1315,13 @@
   recreate:[4] added n
   atop:[1] added m and n
   rebasing to destination parent: d3873e73d99e
-  committed as 88b0dae5369a
-  working directory is now at 88b0dae5369a
+  committed as 0f21d47fe960
+  working directory is now at 0f21d47fe960
 
   $ hg glog --hidden
-  @  7:88b0dae5369a phase-divergent update to a51bce62c219:
+  @  7:0f21d47fe960 phase-divergent update to a51bce62c219:
   |   () draft
-  | x  6:98dad8812511 added n
+  | x  6:302a3ecef922 added n
   | |   () draft
   +---o  5:86419909e017 phase-divergent update to a51bce62c219:
   | |     () draft
@@ -1340,25 +1340,25 @@
   a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
   e1154ec0206ac05c3765f7bd1337e3b96db2974f 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
   4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
-  52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
-  98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
+  52ca78bb98c71222f8afae28d48ae6cfd44a60c9 302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+  302a3ecef922d617073b8e96d3e0f15ab7a6d30d 0f21d47fe96059e134fd230d6d1623ff1d541963 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)
+  @  0f21d47fe960 (7) phase-divergent update to a51bce62c219:
+  |    rewritten(description, parent, content) from 302a3ecef922 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)
+  | 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)
   | |
-  x |  4f25cd9cd2bf (2) added m
+  x |  302a3ecef922 (6) added n
+  | |    rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |
+  | x  4f25cd9cd2bf (2) added m
   | |    split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  98dad8812511 (6) added n
-  | |    rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |
-  | x  52ca78bb98c7 (4) added n
+  x |  52ca78bb98c7 (4) added n
   | |    amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | x  e1154ec0206a (3) added n
+  x |  e1154ec0206a (3) added n
   |/     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
@@ -1383,23 +1383,23 @@
   -n
 
 XXX: not sure this is correct
-  $ hg exp 88b0dae5369a
+  $ hg exp 0f21d47fe960
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7
+  # Node ID 0f21d47fe96059e134fd230d6d1623ff1d541963
   # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
   phase-divergent update to a51bce62c219:
   
   added n
   
-  diff -r a51bce62c219 -r 88b0dae5369a m
+  diff -r a51bce62c219 -r 0f21d47fe960 m
   --- a/m	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -m
-  diff -r a51bce62c219 -r 88b0dae5369a n
+  diff -r a51bce62c219 -r 0f21d47fe960 n
   --- a/n	Thu Jan 01 00:00:00 1970 +0000
   +++ b/n	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@