Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5754:03410b04cf10 mercurial-5.6
tests: back out changeset 59b2be90e9fd
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:57:48 +0800 |
| parents | 8e4f6354b316 |
| children | c2c85576ddfb c0921b5277a0 |
comparison
equal
deleted
inserted
replaced
| 5753:f60f1ded1a20 | 5754:03410b04cf10 |
|---|---|
| 505 (creating divergence locally for simplicity) | 505 (creating divergence locally for simplicity) |
| 506 | 506 |
| 507 $ node=`hg log --rev 'desc("c_E")' -T '{node}'` | 507 $ node=`hg log --rev 'desc("c_E")' -T '{node}'` |
| 508 $ hg rebase -s $node -d 'desc("c_B")' | 508 $ hg rebase -s $node -d 'desc("c_B")' |
| 509 rebasing 5:4ab2719bbab9 "c_E" | 509 rebasing 5:4ab2719bbab9 "c_E" |
| 510 rebasing 6:77ccbf8d837e tip "c_F" | 510 rebasing 6:77ccbf8d837e "c_F" (tip) |
| 511 $ hg phase --public tip | 511 $ hg phase --public tip |
| 512 $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes | 512 $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes |
| 513 rebasing 5:4ab2719bbab9 "c_E" | 513 rebasing 5:4ab2719bbab9 "c_E" |
| 514 rebasing 6:77ccbf8d837e "c_F" | 514 rebasing 6:77ccbf8d837e "c_F" |
| 515 2 new content-divergent changesets | 515 2 new content-divergent changesets |