Mercurial > evolve
view MANIFEST.in @ 5787:32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.
It was supposed to test that that it hits conflict while relocating the
divergent cset but because of some change in previous patches, relocation went
successful and it hits conflict while merging the two divergent csets.
This patch, by making some changes in files content make sure that we get
conflict during relocation.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 24 Jan 2021 20:09:02 +0530 |
parents | fa2fc0cad459 |
children | 7f95546f584e dd518437d4e0 |
line wrap: on
line source
include CHANGELOG include COPYING include hgext3rd/topic/README include MANIFEST.in include README.rst include setup.py recursive-include hgext3rd *.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