Mercurial > hg
annotate tests/sitecustomize.py @ 14721:4fcde634f5e0 stable
revert: be more helpful on uncommitted merges
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
$ hg revert
abort: no files or directories specified
(uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 22 Jun 2011 15:34:33 +0200 |
parents | 58128004cca1 |
children | 0b21ae0a2366 |
rev | line source |
---|---|
10648
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
1 try: |
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
2 import coverage |
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
3 if hasattr(coverage, 'process_startup'): |
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
4 coverage.process_startup() |
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
5 except ImportError: |
58128004cca1
tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff
changeset
|
6 pass |