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-corner-cases.t
branchmercurial-4.6
changeset 4513 d70db7e455dc
parent 3846 f9dad99a90d5
parent 4493 32446b7a6e7c
child 4516 f54bb6eaf5e6
child 4673 3ef4980353af 
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Apr 11 22:41:41 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Apr 11 22:42:13 2019 +0200
@@ -343,9 +343,9 @@
 create some content divergence
 
   $ hg co dff6e52f5e41 --hidden
+  updating to a hidden changeset dff6e52f5e41
+  (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset dff6e52f5e41
-  (hidden revision 'dff6e52f5e41' was rewritten as: 0825dcee2670)
   working directory parent is obsolete! (dff6e52f5e41)
   (use 'hg evolve' to update to its successor: 0825dcee2670)
   $ hg revert -r .^ c
evolve