diff tests/test-unstability-resolution-result.t @ 6395:1328195f76a9 mercurial-5.6

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

--- a/tests/test-unstability-resolution-result.t	Thu Dec 08 20:23:47 2022 +0400
+++ b/tests/test-unstability-resolution-result.t	Mon Feb 06 19:49:33 2023 +0400
@@ -108,7 +108,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:3655f0f50885 "newer a"
-  working directory is now at 1cf0aacfd363
+  working directory is now at 99ec7503cf5a
 
 Stabilize phase-divergent changesets with a different parent
 ============================================================
@@ -116,7 +116,7 @@
 (the same-parent case is handled in test-evolve.t)
 
   $ glog
-  @  6:1cf0aacfd363@default(draft) bk:[] newer a
+  @  6:99ec7503cf5a@default(draft) bk:[] newer a
   |
   o  5:66719795a494@default(draft) bk:[changea] changea
   |
@@ -136,8 +136,8 @@
 
 Get a successors of 8 on it
 
-  $ hg pick 1cf0aacfd363
-  picking 6:1cf0aacfd363 "newer a"
+  $ hg pick 99ec7503cf5a
+  picking 6:99ec7503cf5a "newer a"
 
 Add real change to the successors
 
@@ -146,14 +146,14 @@
 
 Make precursors public
 
-  $ hg phase --hidden --public 1cf0aacfd363
+  $ hg phase --hidden --public 99ec7503cf5a
   1 new phase-divergent changesets
   $ glog
-  @  9:99c21c89bcef@default(draft) bk:[] newer a
+  @  9:998db519ac88@default(draft) bk:[] newer a
   |
   o  7:7bc2f5967f5e@default(draft) bk:[] add c
   |
-  | o  6:1cf0aacfd363@default(public) bk:[] newer a
+  | o  6:99ec7503cf5a@default(public) bk:[] newer a
   |/
   o  5:66719795a494@default(public) bk:[changea] changea
   |
@@ -165,10 +165,10 @@
   $ hg evolve --any --dry-run --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
-  hg rebase --rev 99c21c89bcef --dest 66719795a494;
-  hg update 1cf0aacfd363;
-  hg revert --all --rev 99c21c89bcef;
-  hg commit --message "phase-divergent update to 99c21c89bcef"
+  hg rebase --rev 998db519ac88 --dest 66719795a494;
+  hg update 99ec7503cf5a;
+  hg revert --all --rev 998db519ac88;
+  hg commit --message "phase-divergent update to 998db519ac88"
   $ hg evolve --any --confirm --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
@@ -180,14 +180,14 @@
   atop:[6] newer a
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
-  committed as 8fc63fe1f297
-  working directory is now at 8fc63fe1f297
+  committed as 1e688a4b6db8
+  working directory is now at 1e688a4b6db8
   $ glog
-  @  11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+  @  11:1e688a4b6db8@default(draft) bk:[] phase-divergent update to 99ec7503cf5a:
   |
   | o  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  o |  6:1cf0aacfd363@default(public) bk:[] newer a
+  o |  6:99ec7503cf5a@default(public) bk:[] newer a
   |/
   o  5:66719795a494@default(public) bk:[changea] changea
   |
@@ -198,13 +198,13 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74
-  # Parent  1cf0aacfd36310b18e403e1594871187e0364a82
-  phase-divergent update to 1cf0aacfd363:
+  # Node ID 1e688a4b6db81db9b647e9045aff0fcbc5c32b8d
+  # Parent  99ec7503cf5a2cd545f41792129becc4172e9e9d
+  phase-divergent update to 99ec7503cf5a:
   
   newer a
   
-  diff -r 1cf0aacfd363 -r 8fc63fe1f297 a
+  diff -r 99ec7503cf5a -r 1e688a4b6db8 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@