Mercurial > evolve
comparison tests/test-evolve-orphan-merge.t @ 5099:dd9037486a90 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 30 Jan 2020 14:32:04 +0700 |
| parents | f0c18ad24273 |
| children | 7fa4bb23a78a |
comparison
equal
deleted
inserted
replaced
| 5086:553b2f2fda93 | 5099:dd9037486a90 |
|---|---|
| 527 merge them again. After getting their work done, they may want to get rid of | 527 merge them again. After getting their work done, they may want to get rid of |
| 528 that branch and they prune all their changeset, which will result in this | 528 that branch and they prune all their changeset, which will result in this |
| 529 case where merge commit becomes orphan with its ancestors pruned up until a | 529 case where merge commit becomes orphan with its ancestors pruned up until a |
| 530 point where the other parent of merge is the first non-pruned ancestor. | 530 point where the other parent of merge is the first non-pruned ancestor. |
| 531 | 531 |
| 532 $ hg evolve -r . | 532 Note: allowing an empty commit here to have the same output on all hg versions. |
| 533 In newer versions or Mercurial this command would not create a new commit. | |
| 534 hg <= 5.2 (32d11a23c9cf) | |
| 535 | |
| 536 $ hg evolve -r . --config ui.allowemptycommit=true | |
| 533 move:[28] merged l and x | 537 move:[28] merged l and x |
| 534 atop:[0] added hgignore | 538 atop:[0] added hgignore |
| 535 working directory is now at b61ba77b924a | 539 working directory is now at * (glob) |
| 536 | 540 |
| 537 $ hg glog | 541 $ hg glog |
| 538 @ 29:b61ba77b924a merged l and x | 542 @ 29:* merged l and x (glob) |
| 539 | () draft | 543 | () draft |
| 540 o 0:8fa14d15e168 added hgignore | 544 o 0:8fa14d15e168 added hgignore |
| 541 () draft | 545 () draft |
| 542 | 546 |
| 543 7) When one parent is pruned without successor and has no parent | 547 7) When one parent is pruned without successor and has no parent |