Mercurial > public > mercurial-scm > hg
view tests/helpers-testrepo.sh @ 31257:11831d755b51
merge: remove uses of manifest.matches
This gets rid of the manifest.matches calls in merge.py in favor of the new api.
This is part of getting rid of manifest.matches since it is O(manifest).
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 07 Mar 2017 18:38:20 -0800 |
parents | 3c9066ed557c |
children | 6c113a7dec52 |
line wrap: on
line source
# The test-repo is a live hg repository which may have evolution # markers created, e.g. when a ~/.hgrc enabled evolution. # # Tests are run using a custom HGRCPATH, which do not # enable evolution markers by default. # # If test-repo includes evolution markers, and we do not # enable evolution markers, hg will occasionally complain # when it notices them, which disrupts tests resulting in # sporadic failures. # # Since we aren't performing any write operations on the # test-repo, there's no harm in telling hg that we support # evolution markers, which is what the following lines # for the hgrc file do: cat >> $HGRCPATH << EOF [experimental] evolution=createmarkers EOF