Mercurial > evolve
diff tests/test-tutorial.t @ 1443:6c122c975125
evolve: add a hint when the parent working copy become obsolete
This should help people find the right commands to recover from this situation.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 24 Jun 2015 16:37:02 -0700 |
parents | aff6bc2a6b2d |
children | 5f6e78aea094 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Tue Jun 23 18:16:21 2015 -0700 +++ b/tests/test-tutorial.t Wed Jun 24 16:37:02 2015 -0700 @@ -742,12 +742,14 @@ searching for changes no changes found working directory parent is obsolete! + (use "hg evolve" to update to its successor) now let's see where we are, and update to the successor $ hg parents bf1b0d202029 (draft): animals working directory parent is obsolete! + (use "hg evolve" to update to its successor) $ hg evolve update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved