Mercurial > evolve
view MANIFEST.in @ 5561:d6b3f32f8261
evolve: add logic to decide local and other side before merge
Before we perform merge between the two content-divergent csets,
this logic decides which cset would reside at which side i.e.
local or other.
for e.g. in case of public content divergence where one side of
divergence is public, we always keep public one to local side.
(this logic of always keeping public one to local side may change in
future, but for now that's what it is.)
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Thu, 13 Aug 2020 17:22:19 +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