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