Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 1442:6a219f8089f9 | 1443:6c122c975125 |
|---|---|
| 740 $ hg pull local # we up again to trigger the warning. it was displayed during the push | 740 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
| 741 pulling from $TESTTMP/local (glob) | 741 pulling from $TESTTMP/local (glob) |
| 742 searching for changes | 742 searching for changes |
| 743 no changes found | 743 no changes found |
| 744 working directory parent is obsolete! | 744 working directory parent is obsolete! |
| 745 (use "hg evolve" to update to its successor) | |
| 745 | 746 |
| 746 now let's see where we are, and update to the successor | 747 now let's see where we are, and update to the successor |
| 747 | 748 |
| 748 $ hg parents | 749 $ hg parents |
| 749 bf1b0d202029 (draft): animals | 750 bf1b0d202029 (draft): animals |
| 750 working directory parent is obsolete! | 751 working directory parent is obsolete! |
| 752 (use "hg evolve" to update to its successor) | |
| 751 $ hg evolve | 753 $ hg evolve |
| 752 update:[8] animals | 754 update:[8] animals |
| 753 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 755 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 754 working directory is now at ee942144f952 | 756 working directory is now at ee942144f952 |
| 755 | 757 |