Mercurial > evolve
comparison tests/test-tutorial.t @ 3375:1cb549cd6236
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 05 Jan 2018 23:20:30 +0100 |
| parents | ae6fddf39933 380fa6e8baf2 |
| children | eacf6149b678 |
comparison
equal
deleted
inserted
replaced
| 3374:612b3bd31499 | 3375:1cb549cd6236 |
|---|---|
| 1513 $ cd ../remote | 1513 $ cd ../remote |
| 1514 $ hg pull local # we up again to trigger the warning. it was displayed during the push | 1514 $ hg pull local # we up again to trigger the warning. it was displayed during the push |
| 1515 pulling from $TESTTMP/local (glob) | 1515 pulling from $TESTTMP/local (glob) |
| 1516 searching for changes | 1516 searching for changes |
| 1517 no changes found | 1517 no changes found |
| 1518 working directory parent is obsolete! (bf1b0d202029) | |
| 1519 (use 'hg evolve' to update to its successor: ee942144f952) | |
| 1520 | 1518 |
| 1521 Now let's see where we are, and update to the successor. | 1519 Now let's see where we are, and update to the successor. |
| 1522 | 1520 |
| 1523 $ hg parents | 1521 $ hg parents |
| 1524 bf1b0d202029 (draft): animals | 1522 bf1b0d202029 (draft): animals |