Mercurial > hg
view tests/helpers-testrepo.sh @ 32956:4f0a7f604449
commands: move checkconflict to bookmarks module
Again, commands.bookmark is getting too large. checkconflict already has
a lot of state and putting it in the bmstore makes more sense than
having it as a closure. This also allows extensions a place to override
this behavior.
While we're here, add a documentation string because, well, we should be
documenting more of our methods.
author | Sean Farley <sean@farley.io> |
---|---|
date | Sat, 10 Jun 2017 23:42:38 -0700 |
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