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-issue5958.t
changeset 5123 900668a93629
parent 5013 18fe83bf7b14
child 5323 417503ef667d 
--- a/tests/test-evolve-issue5958.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-issue5958.t	Tue Jan 14 20:20:13 2020 +0700
@@ -70,14 +70,14 @@
   | |    rewritten(parent, content) as 08bc7ba82799 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  a25dd7af6cf6 (3) add foo.txt
-  | |    rewritten(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  0065551bd38f (2) add foo.txt
-  |/     rewritten(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  cc71ffbc7c00 (1) add foo.txt
-       rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+       date-changed(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+       date-changed(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg evolve --content-divergent
   merge:[6] add foo.txt
evolve