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 5123 900668a93629
parent 5029 421b295e32b4
child 5162 a7fb433faab6
child 5341 13376ca93fa3 
--- a/tests/test-evolve-content-divergent-stack.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-stack.t	Tue Jan 14 20:20:13 2020 +0700
@@ -672,11 +672,11 @@
   | |    rewritten(description, content) as 74fbf3e6a0b6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   x |  8e222f257bbf (5) watbar to a
-  |/     rewritten(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  c7586e2a9264 (1) added a
        rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg obslog -r 'desc("added b")' --all
   @  2a955e808c53 (14) added b
@@ -684,14 +684,14 @@
   | *  509103439e5e (17) added b
   | |
   x |  6eb54b5af3fb (11) added b
-  | |    rewritten(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    amended(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  d5f148423c16 (6) added b
-  |/     rewritten(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |/     amended(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  b1661037fa25 (2) added b
-       rewritten(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+       rebased(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 Again, let's evolve the stack
evolve