Mercurial > evolve
comparison README @ 1576:526253198860
evolve: handle merge commit with single obsolete parent (issue4389)
This handles evolving merge commits with a single obsolete parent. Merge
commits with two obsolete parents are still unsupported. Note this depends
on a change to merge.graft in core. Older versions of mercurial will not
have this functionality. Also, test-unstable.t will fail with older
versions.
| author | Andrew Halberstadt <ahalberstadt@mozilla.com> |
|---|---|
| date | Thu, 26 Nov 2015 20:38:31 -0500 |
| parents | 25254b2f8116 |
| children | 6079dcbfb726 |
comparison
equal
deleted
inserted
replaced
| 1575:0c8548df67fe | 1576:526253198860 |
|---|---|
| 60 | 60 |
| 61 - split: add a new command to split changesets, | 61 - split: add a new command to split changesets, |
| 62 - tests: drop our copy of 'run-tests.py' use core one instead, | 62 - tests: drop our copy of 'run-tests.py' use core one instead, |
| 63 - bookmark: do all bookmark movement within a transaction. | 63 - bookmark: do all bookmark movement within a transaction. |
| 64 - evolve: compatibility with Mercurial 3.7 | 64 - evolve: compatibility with Mercurial 3.7 |
| 65 - evolve: support merge with a single obsolete parent. | |
| 65 | 66 |
| 66 5.2.2 -- | 67 5.2.2 -- |
| 67 | 68 |
| 68 - no longer lock the repository for `hg parents` (issue4895) | 69 - no longer lock the repository for `hg parents` (issue4895) |
| 69 - updated help for the `evolve` command | 70 - updated help for the `evolve` command |