Mercurial > evolve
comparison tests/test-evolve-content-divergent-relocation.t @ 5766:82da27321e91 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
# no-check-commit
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 31 Jan 2021 16:15:26 +0800 |
| parents | 8d93e7fc0daa 03410b04cf10 |
| children | 0f32359bcf3e |
comparison
equal
deleted
inserted
replaced
| 5765:98e87c181e0f | 5766:82da27321e91 |
|---|---|
| 661 working directory parent is obsolete! (898ddd4443b3) | 661 working directory parent is obsolete! (898ddd4443b3) |
| 662 | 662 |
| 663 The other side of the divergence gets amended so it matches upstream. | 663 The other side of the divergence gets amended so it matches upstream. |
| 664 Relocation (onto upstream) will therefore result in no changes to commit. | 664 Relocation (onto upstream) will therefore result in no changes to commit. |
| 665 $ hg revert -r 'desc("upstream")' --all | 665 $ hg revert -r 'desc("upstream")' --all |
| 666 reverting a | |
| 666 removing b | 667 removing b |
| 667 reverting a | |
| 668 $ hg amend --config experimental.evolution.allowdivergence=True | 668 $ hg amend --config experimental.evolution.allowdivergence=True |
| 669 2 new content-divergent changesets | 669 2 new content-divergent changesets |
| 670 | 670 |
| 671 Add a commit on top. This one should become an orphan. Evolving it later | 671 Add a commit on top. This one should become an orphan. Evolving it later |
| 672 should put it on top of the other divergent side (the one that's on top of | 672 should put it on top of the other divergent side (the one that's on top of |