Mercurial > evolve
diff tests/test-evolve-content-divergent-interrupted.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 e8660b28bfee |
| children | 15406dfa60e1 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Fri May 08 22:18:15 2020 +0800 +++ b/tests/test-evolve-content-divergent-interrupted.t Fri May 08 22:50:09 2020 +0800 @@ -56,9 +56,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) @@ -279,9 +279,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 @@ -423,9 +423,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)