Mercurial > evolve
view MANIFEST.in @ 5474:86c6c7951f74
evolve: fix content-div resolution when in parent-child form
case:
"two divergent csets where one is the parent of other"
cset_b (content-divergent)
|
cset_a (content-divergent)
|
~
Before this patch, we were not correctly handling the case when both the
divergent cset are in parent-child form. And its resolution was going
through the logic which solves other variants of content-divergence.
Resolution (after this patch):
merge is performed between the two and parent (or parent's successor,
if apply) of lower one is treated as resolution parent.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sun, 26 Jul 2020 01:02:22 +0530 |
parents | 9e0f91cb5242 |
children | 7d5d9301c244 |
line wrap: on
line source
include CHANGELOG include COPYING include hgext3rd/topic/README include MANIFEST.in include README.rst include setup.py recursive-include tests *.py *.sh *.t 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 exclude docs/tutorial/.netlify exclude .gitlab-ci.yml exclude ./hgext3rd/evolve/legacy.py exclude .hg-format-source exclude Makefile exclude tests/test-drop.t exclude tests/test-oldconvert.t prune contrib prune debian prune .gitlab prune hgext3rd/evolve/hack