diff tests/test-evolve-content-divergent-meta.t @ 5304:83ceafbaa7d6 stable

branching: merge into stable in preparation for release

--- a/tests/test-evolve-content-divergent-meta.t	Mon Apr 20 00:05:05 2020 +0800
+++ b/tests/test-evolve-content-divergent-meta.t	Fri May 08 18:22:26 2020 +0800
@@ -93,7 +93,7 @@
 
 Make sure resultant cset don't replace the initial user with user running the command:
   $ hg log -r tip
-  changeset:   5:443bd2972210
+  changeset:   5:8cabe7248d20
   tag:         tip
   parent:      1:1740ad2a1eda
   user:        foo <[e-mail]>
@@ -133,7 +133,7 @@
   with: [4] added c
   base: [2] added c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 932d6ceb7672
+  working directory is now at 2300a271820b
 
   $ hg log -r tip | grep "^user"
   user:        foouser
@@ -154,7 +154,7 @@
   with: [5] updated c
   base: [2] added c
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 202a770d8c1f
+  working directory is now at 3d7ae55fbfe4
 
   $ hg log -r tip | grep "^user"
   user:        baruser, foouser
@@ -219,15 +219,15 @@
   with: [4] add foo.txt
   base: [1] add foo.txt
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 6c144bb30333
+  working directory is now at bbcfcd9b9e21
   $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
-  5 6c144bb30333 1969-12-31 23:59 -0000: 
+  5 bbcfcd9b9e21 1969-12-31 23:59 -0000: 
 
 date: updated one one side to an older value
 
   $ hg strip .
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg
+  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/bbcfcd9b9e21-567273f3-backup.hg
   2 new content-divergent changesets
   $ hg up tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -266,15 +266,15 @@
   with: [5] add foo.txt
   base: [1] add foo.txt
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 806d0024c04d
+  working directory is now at 4708538fed7d
   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
-  6 806d0024c04d 1969-12-31 23:59 -0000: 
+  6 4708538fed7d 1969-12-31 23:59 -0000: 
 
 date: updated one side to an newer value
 
   $ hg strip .
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg
+  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/4708538fed7d-ca550351-backup.hg
   2 new content-divergent changesets
   $ hg update a25dd7af6cf6 --hidden
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -315,15 +315,15 @@
   with: [6] add foo.txt
   base: [1] add foo.txt
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 51e08ac59670
+  working directory is now at dbea1c7e245d
   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
-  7 51e08ac59670 1970-01-01 00:02 +0000: 
+  7 dbea1c7e245d 1970-01-01 00:02 +0000: 
 
 date: updated each side to a different value, newer should win
 
   $ hg strip .
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg
+  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/dbea1c7e245d-47ae3d98-backup.hg
   2 new content-divergent changesets
   $ hg up tip
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -365,8 +365,8 @@
   with: [8] add foo.txt
   base: [1] add foo.txt
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at ab7c0a425dc9
+  working directory is now at 10c950c7c11f
   $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
-  9 ab7c0a425dc9 1970-01-01 00:13 +0000: 
+  9 10c950c7c11f 1970-01-01 00:13 +0000: 
 
   $ cd ..