diff tests/test-stabilize-result.t @ 3716:e5ba6531503e mercurial-4.3

testcompat: update output for Mercurial 4.3

Lets of minor update + one major update to tests/test-evolve-phase-divergence.t
since all hashed chance (different instability name).

--- a/tests/test-stabilize-result.t	Mon Apr 23 12:23:00 2018 +0200
+++ b/tests/test-stabilize-result.t	Wed Apr 25 01:58:45 2018 +0100
@@ -56,7 +56,7 @@
   $ hg debugobsolete
   102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
-  cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
 
 Test evolve with conflict
 
@@ -178,10 +178,10 @@
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
   computing new diff
-  committed as e34e87ea7b83
-  working directory is now at e34e87ea7b83
+  committed as cd735a3aeb32
+  working directory is now at cd735a3aeb32
   $ glog
-  @  14:e34e87ea7b83@default(draft) bk:[] bumped update to 1cf0aacfd363:
+  @  14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
   |
   | o  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -196,13 +196,13 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74
+  # Node ID cd735a3aeb32e80b92f780c4ace1650597d581b2
   # Parent  1cf0aacfd36310b18e403e1594871187e0364a82
-  phase-divergent update to 1cf0aacfd363:
+  bumped update to 1cf0aacfd363:
   
   newer a
   
-  diff -r 1cf0aacfd363 -r 8fc63fe1f297 a
+  diff -r 1cf0aacfd363 -r cd735a3aeb32 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 @@