tests/sitecustomize.py
author Martin von Zweigbergk <martinvonz@gmail.com>
Wed, 13 Aug 2014 11:50:13 -0700
branchstable
changeset 22147 9ac98c2aa95c
parent 14971 0b21ae0a2366
child 24505 031947baf4d0
permissions -rw-r--r--
histedit: preserve initial author on fold (issue4296) When the authorship of the changeset folded in does not match that of the base changeset, we currently use the configured ui.username instead. This is especially surprising when the user is not the author of either of the changesets. In such cases, the resulting authorship (the user's) is clearly incorrect. Even when the user is folding in a patch they authored themselves, it's not clear whether they should take over the authorship. Let's instead keep it simple and always preserve the base changeset's authorship. This is also how "git rebase -i" handles folding/squashing.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
14971
0b21ae0a2366 tests: use getattr instead of hasattr
Augie Fackler <durin42@gmail.com>
parents: 10648
diff changeset
     3
    getattr(coverage, 'process_startup', lambda: None)()
10648
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
     4
except ImportError:
58128004cca1 tests: use external coverage, mandate newer version
Dirkjan Ochtman <djc.ochtman@kentyde.com>
parents:
diff changeset
     5
    pass