Mercurial > evolve
view MANIFEST.in @ 3882:55b8c7e7e352
compat: temporarily move copies fix to compat.py
This patch moves a fixed version of copies._fullcopytracing() to compat.py as
this was not fixed in core before release and also we need to do this anyway for
the older versions of mercurial.
This fix is that when base changeset is not ancestor of any of the merging
commits, we don't throw an error.
The phabricator differential which will fix this in core is
https://phab.mercurial-scm.org/D3896.
This fixes the traceback we get in previous changeset while relocating one of
the content-divergent changeset.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 21 Jul 2018 02:42:29 +0530 |
parents | b3dbba6e34c9 |
children | 48b30ff742cb |
line wrap: on
line source
exclude contrib recursive-exclude contrib * exclude hgext3rd/evolve/hack 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