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-content-divergent-stack.t
changeset 5344 142827ad86f3
parent 5341 13376ca93fa3
child 5345 a73cdef2e33f 
--- a/tests/test-evolve-content-divergent-stack.t	Mon Dec 09 11:09:11 2019 -0800
+++ b/tests/test-evolve-content-divergent-stack.t	Thu May 07 07:57:14 2020 -0700
@@ -654,7 +654,7 @@
   |/   parent:      0:8fa14d15e168
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten using evolve as 21:c68b60ab6619
+  |    obsolete:    rebased using evolve as 21:c68b60ab6619
   |    summary:     watbar to a
   |
   o  changeset:   0:8fa14d15e168
@@ -666,10 +666,10 @@
   o    c68b60ab6619 (21) watbar to a
   |\
   x |  186bdc2cdfa2 (20) watbar to a
-  | |    meta-changed(meta) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  c04ff147ef79 (10) added a
-  | |    rewritten(description, meta, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8e222f257bbf (5) watbar to a
   |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
evolve