Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-main.t @ 4784:ecf0f3bc7468 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 14:43:17 +0200 |
| parents | 3ef4980353af b6c819facbe8 |
| children | 1752a2e7a226 |
comparison
equal
deleted
inserted
replaced
| 4783:5d50f3de4714 | 4784:ecf0f3bc7468 |
|---|---|
| 46 $ hg phase --public | 46 $ hg phase --public |
| 47 | 47 |
| 48 Amend again to create a cset divergent to public one: | 48 Amend again to create a cset divergent to public one: |
| 49 | 49 |
| 50 $ hg up 1 --hidden -q | 50 $ hg up 1 --hidden -q |
| 51 updated to hidden changeset 5f6d8a4bf34a | 51 updating to a hidden changeset 5f6d8a4bf34a |
| 52 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) | 52 (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f) |
| 53 working directory parent is obsolete! (5f6d8a4bf34a) | 53 working directory parent is obsolete! (5f6d8a4bf34a) |
| 54 | 54 |
| 55 $ echo "I am second" >> b | 55 $ echo "I am second" >> b |
| 56 $ hg ci --amend -m "updated b" | 56 $ hg ci --amend -m "updated b" |
| 140 $ hg phase --public | 140 $ hg phase --public |
| 141 | 141 |
| 142 Amend again to create a cset divergent to public one: | 142 Amend again to create a cset divergent to public one: |
| 143 | 143 |
| 144 $ hg up 1 --hidden -q | 144 $ hg up 1 --hidden -q |
| 145 updated to hidden changeset 5f6d8a4bf34a | 145 updating to a hidden changeset 5f6d8a4bf34a |
| 146 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) | 146 (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c) |
| 147 working directory parent is obsolete! (5f6d8a4bf34a) | 147 working directory parent is obsolete! (5f6d8a4bf34a) |
| 148 | 148 |
| 149 $ echo "I am bar" > b | 149 $ echo "I am bar" > b |
| 150 $ hg ci --amend -m "updated b" | 150 $ hg ci --amend -m "updated b" |