equal
deleted
inserted
replaced
739 $ cd ../remote |
739 $ cd ../remote |
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! (bf1b0d202029) |
745 (use 'hg evolve' to update to its successor) |
745 (use 'hg evolve' to update to its successor: ee942144f952) |
746 |
746 |
747 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 |
748 |
748 |
749 $ hg parents |
749 $ hg parents |
750 bf1b0d202029 (draft): animals |
750 bf1b0d202029 (draft): animals |
751 working directory parent is obsolete! |
751 working directory parent is obsolete! (bf1b0d202029) |
752 (use 'hg evolve' to update to its successor) |
752 (use 'hg evolve' to update to its successor: ee942144f952) |
753 $ hg evolve |
753 $ hg evolve |
754 update:[8] animals |
754 update:[8] animals |
755 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 |
756 working directory is now at ee942144f952 |
756 working directory is now at ee942144f952 |
757 |
757 |