Mercurial > evolve
diff tests/test-evolve-obshistory-content-divergent.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 | 053f1fc12545 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-content-divergent.t Fri May 08 22:18:15 2020 +0800 +++ b/tests/test-evolve-obshistory-content-divergent.t Fri May 08 22:50:09 2020 +0800 @@ -40,9 +40,9 @@ summary: ROOT $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg amend -m "A2" @@ -429,8 +429,8 @@ (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' + updating to a hidden changeset 471f378eab4c + (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)