Mercurial > evolve
diff tests/test-evolve-content-divergent-corner-cases.t @ 5318:88f9bbba392d mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 22:50:09 +0800 |
| parents | 1752a2e7a226 011b53a9d03c |
| children | 15406dfa60e1 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-corner-cases.t Fri May 08 22:18:15 2020 +0800 +++ b/tests/test-evolve-content-divergent-corner-cases.t Fri May 08 22:50:09 2020 +0800 @@ -415,9 +415,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