Mercurial > evolve

diff tests/test-evolve-content-divergent-corner-cases.t @ 5834:c2484b0217ee mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:49:22 +0800
parents 0f32359bcf3e be8f7eb3f3a0
children
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Mar 11 14:48:12 2021 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Mar 11 14:49:22 2021 +0800
@@ -434,9 +434,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