Mercurial > hg
view tests/sitecustomize.py @ 34548:b4955650eb57
merge: add merge action 'pr' to rename files during update
Add a new merge action to handle a path conflict by renaming the conflicting
file to a safe name.
The rename is just to avoid problems on the filesystem. The conflict is still
considered unresolved until the user marks the original path as resolved.
Differential Revision: https://phab.mercurial-scm.org/D777
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | d2c40510104e |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import import os if os.environ.get('COVERAGE_PROCESS_START'): try: import coverage import uuid covpath = os.path.join(os.environ['COVERAGE_DIR'], 'cov.%s' % uuid.uuid1()) cov = coverage.coverage(data_file=covpath, auto_data=True) cov._warn_no_data = False cov._warn_unimported_source = False cov.start() except ImportError: pass