Mercurial > evolve
diff tests/test-evolve-abort-contentdiv.t @ 3928:a50b7e3d86c2 mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:42:14 +0200 |
| parents | f7afd3a158e3 |
| children | d00f0c369bc7 85c99079d41f |
line wrap: on
line diff
--- a/tests/test-evolve-abort-contentdiv.t Thu Aug 02 04:11:54 2018 +0200 +++ b/tests/test-evolve-abort-contentdiv.t Thu Aug 02 02:42:14 2018 +0200 @@ -45,9 +45,9 @@ $ hg amend $ hg up c41c793e0ef1 --hidden + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: e49523854bc8) @@ -253,9 +253,9 @@ $ hg amend $ hg up --hidden c41c793e0ef1 + updating to a hidden changeset c41c793e0ef1 + (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: 69bdd23a9b0d) $ echo bar > d