Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-public-content-divergent-corner-cases.t
changeset 5345 a73cdef2e33f
parent 5341 13376ca93fa3
child 5349 e8660b28bfee 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu May 07 07:57:14 2020 -0700
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri May 08 04:02:22 2020 +0200
@@ -137,14 +137,14 @@
   base: [2] added c
   rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  committed as 454f3998cb58
-  working directory is now at 454f3998cb58
+  committed as 0941937e8302
+  working directory is now at 0941937e8302
 
   $ hg glog -p
-  @  8:454f3998cb58 phase-divergent update to c0d7ee6604ea:
+  @  8:0941937e8302 phase-divergent update to c0d7ee6604ea:
   |   draft
   |
-  |  diff -r c0d7ee6604ea -r 454f3998cb58 c
+  |  diff -r c0d7ee6604ea -r 0941937e8302 c
   |  --- a/c	Thu Jan 01 00:00:00 1970 +0000
   |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   |  @@ -1,1 +1,2 @@
@@ -447,27 +447,27 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  committed as 0c67e963324a
-  working directory is now at 0c67e963324a
+  committed as bb4d94ae1a5a
+  working directory is now at bb4d94ae1a5a
 
   $ hg export
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 0c67e963324a7f1c84ece16c7d971268b862d8bd
+  # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560
   # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
   phase-divergent update to 93cd84bbdaca:
   
   added c e
   
-  diff -r 93cd84bbdaca -r 0c67e963324a d
+  diff -r 93cd84bbdaca -r bb4d94ae1a5a d
   --- a/d	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -dd
   +resolved
-  diff -r 93cd84bbdaca -r 0c67e963324a e
+  diff -r 93cd84bbdaca -r bb4d94ae1a5a e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
evolve