Mercurial > evolve
view MANIFEST.in @ 4992:1eab41625dee stable
evolve: abort if deciding resolution parent is ambiguous
While solving content-divergence, it could be hard to decide
which cset should be treated as a resolution parent if there
are multiple successors of divergent cset. i.e split case.
But we are planning to make some update in handling this split
case:
1) consider highest one if all splitted csets are in a single
topological branch
2) still need to decide if 1) doesn't apply
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 06 Dec 2019 23:43:00 +0530 |
parents | a8525a2e0748 |
children | 60e2a6a11d62 |
line wrap: on
line source
exclude contrib exclude .hg-format-source recursive-exclude contrib * exclude hgext3rd/evolve/hack exclude .gitlab-ci.yml recursive-exclude hgext3rd/evolve/hack * exclude hgext3rd/evolve/legacy.py exclude Makefile exclude tests/test-drop.t exclude tests/test-inhibit.t exclude tests/test-oldconvert.t exclude docs/tutorial/.netlify include COPYING include docs/figures/hgview-example.png include docs/makefile include docs/*.py include docs/README include docs/*.rst include docs/static/*.svg include docs/tutorials/*.t 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 CHANGELOG include setup.py include tests/*.py include tests/*.sh include tests/testlib/*.sh include tests/*.t recursive-include docs/tutorial *.rst recursive-include docs/tutorial *.css include docs/tutorial/standalone.html recursive-include docs/tutorial *.js recursive-include docs/tutorial *.md recursive-include docs/tutorial *.py recursive-include docs/tutorial *.sh recursive-include docs/tutorial *.t prune debian recursive-include docs/figures *.svg