Mercurial > evolve
diff tests/test-evolve-obshistory-amend-then-fold.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | f3713d41b85b |
| children | 537fd9a86c06 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t Thu Aug 02 02:42:15 2018 +0200 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Thu Aug 02 02:47:44 2018 +0200 @@ -231,14 +231,10 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update --hidden 0dec01379d3b - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192)