Mercurial > evolve
diff tests/test-obsolete.t @ 3432:f57be161f34b
test: update with new 'update' hint about obsfate
CORE-TEST-OUTPUT-UPDATE: 35a0f6f31eef
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 20 Jan 2018 11:59:36 +0100 |
| parents | 2e703ed1c713 |
| children | 2823c82ad8a4 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Sat Jan 13 14:35:49 2018 -0800 +++ b/tests/test-obsolete.t Sat Jan 20 11:59:36 2018 +0100 @@ -122,6 +122,7 @@ - 725c380fe99b $ hg up --hidden 3 -q updating to a hidden changeset 0d3f46688ccc + (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents @@ -707,6 +708,7 @@ $ hg up --hidden 3 -q updating to a hidden changeset 0d3f46688ccc + (hidden revision '0d3f46688ccc' has diverged) working directory parent is obsolete! (0d3f46688ccc) $ hg evolve parent is obsolete with multiple successors: @@ -726,6 +728,7 @@ $ hg up --hidden 2 updating to a hidden changeset 4538525df7e2 + (hidden revision '4538525df7e2' has diverged) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)