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 5163 1752a2e7a226
parent 5091 308c1e09f80f
parent 5162 a7fb433faab6
child 5368 844b1ad5b34b 
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Feb 29 15:17:31 2020 +0700
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sat Feb 29 15:18:00 2020 +0700
@@ -315,9 +315,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