Mercurial > evolve
view MANIFEST.in @ 5206:dc3571a37b56 stable
evolve: support ancestor of orphan split with unrelated changeset in between
This is done by searching for roots and heads within the range delimited on
both sides by the target revs instead of just within the target revs.
Example:
o 5
|
o 4
|
o 3
|
| * 2
| |
| x 1
|/
o 0
1 is obsoleted by 3 and 5. We are considering the case when 2 gets evolved.
Before the change, both roots and heads were [3, 5]. The user was offered a
choice between 3 and 5 as the destination.
After the change, roots are [3] and heads are [5]. 5 is chosen as the
destination.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Wed, 11 Mar 2020 16:04:06 +0100 |
parents | 40ae7c5b3b17 |
children | 3528fb011417 |
line wrap: on
line source
prune contrib prune debian prune .gitlab prune hgext3rd/evolve/hack exclude .hg-format-source exclude .gitlab-ci.yml exclude hgext3rd/evolve/legacy.py exclude Makefile exclude tests/test-drop.t exclude tests/test-inhibit.t exclude tests/test-oldconvert.t include CHANGELOG include COPYING include hgext3rd/__init__.py include hgext3rd/evolve/*.py include hgext3rd/evolve/thirdparty/*.py include hgext3rd/topic/*.py include hgext3rd/topic/README include MANIFEST.in include README include setup.py include tests/*.py include tests/*.sh include tests/testlib/*.sh include tests/*.t exclude docs/tutorial/.netlify include docs/makefile include docs/*.py include docs/README include docs/*.rst include docs/static/*.svg include docs/tutorials/*.t include docs/tutorial/standalone.html recursive-include docs/figures *.svg *.png recursive-include docs/tutorial *.css *.js *.md *.py *.rst *.sh *.t