Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5318:88f9bbba392d mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 22:50:09 +0800 |
| parents | 1752a2e7a226 011b53a9d03c |
| children | 15406dfa60e1 |
comparison
equal
deleted
inserted
replaced
| 5317:011b53a9d03c | 5318:88f9bbba392d |
|---|---|
| 70 draft | 70 draft |
| 71 | 71 |
| 72 | 72 |
| 73 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: | 73 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull: |
| 74 $ hg up 2 --hidden -q | 74 $ hg up 2 --hidden -q |
| 75 updated to hidden changeset 155349b645be | 75 updating to a hidden changeset 155349b645be |
| 76 (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) | 76 (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea) |
| 77 working directory parent is obsolete! (155349b645be) | 77 working directory parent is obsolete! (155349b645be) |
| 78 | 78 |
| 79 $ echo cc >> c | 79 $ echo cc >> c |
| 80 $ hg ci --amend -m "updated c" | 80 $ hg ci --amend -m "updated c" |