Mercurial > evolve
diff tests/test-obsolete.t @ 3410:39112fd4d5ed stable
branching: backed out test output changes from core-02fdb8c018aa
This backs out evolve-1905aac253f0.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:42:44 +0100 |
| parents | 1905aac253f0 |
| children | e1f3e43a50a4 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Jan 11 18:07:09 2018 +0530 +++ b/tests/test-obsolete.t Mon Jan 15 19:42:44 2018 +0100 @@ -121,7 +121,6 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents @@ -702,7 +701,6 @@ $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc working directory parent is obsolete! (0d3f46688ccc) $ hg evolve parent is obsolete with multiple successors: @@ -721,7 +719,6 @@ Check import reports new unstable changeset: $ hg up --hidden 2 - updating to a hidden changeset 4538525df7e2 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)