##// END OF EJS Templates
resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

File last commit:

r24505:031947ba default
r27025:ec372573 default
Show More
sitecustomize.py
16 lines | 510 B | text/x-python | PythonLexer
import os
if os.environ.get('COVERAGE_PROCESS_START'):
try:
import coverage
import random
# uuid is better, but not available in Python 2.4.
covpath = os.path.join(os.environ['COVERAGE_DIR'],
'cov.%s' % random.randrange(0, 1000000000000))
cov = coverage.coverage(data_file=covpath, auto_data=True)
cov._warn_no_data = False
cov._warn_unimported_source = False
cov.start()
except ImportError:
pass