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 5123 900668a93629
parent 5079 1f92a6aa40d6
child 5159 e5fe3ca5e6ad
child 5293 4da1d21231ae 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Tue Jan 14 20:20:13 2020 +0700
@@ -372,7 +372,7 @@
   | *  e568fd1029bb (4) added c e
   |/
   x  9150fe93bec6 (3) added d
-       rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+       amended(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
          diff -r 9150fe93bec6 -r 93cd84bbdaca d
          --- a/d	Thu Jan 01 00:00:00 1970 +0000
          +++ b/d	Thu Jan 01 00:00:00 1970 +0000
@@ -759,9 +759,9 @@
   | |    rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8ae8db670b4a (10) c_F
-  |/     rewritten(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  77ccbf8d837e (6) c_F
-       rewritten(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
evolve