diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2016-08-29 18:22:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 18:22:32 +0200 |
| commit | c1fd474227c9be7e802d07d113c026847916c574 (patch) | |
| tree | b239dc7f500da3f63205748bb67d9e0f7262ee3d | |
| parent | 4d9325186507bc4c1043fda7e3d522ec7c649c37 (diff) | |
| parent | 1899597ad77aba72c24ee3399a8d656bba36acbe (diff) | |
| download | setuptools-scm-c1fd474227c9be7e802d07d113c026847916c574.tar.gz | |
Merge pull request #98 from RonnyPfannschmidt/reenable-hgrcpath
allow HGRCPATH env var - potentially fixes #97
| -rw-r--r-- | setuptools_scm/utils.py | 2 | ||||
| -rw-r--r-- | testing/test_mercurial.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/setuptools_scm/utils.py b/setuptools_scm/utils.py index fa5b548..5623ff0 100644 --- a/setuptools_scm/utils.py +++ b/setuptools_scm/utils.py @@ -50,8 +50,6 @@ def do_ex(cmd, cwd='.'): cwd=str(cwd), env=_always_strings(dict( os.environ, - # disable hgrc processing other than .hg/hgrc - HGRCPATH='', # try to disable i18n LC_ALL='C', LANGUAGE='', diff --git a/testing/test_mercurial.py b/testing/test_mercurial.py index c98d19b..f26002b 100644 --- a/testing/test_mercurial.py +++ b/testing/test_mercurial.py @@ -93,5 +93,5 @@ def test_version_in_merge(wd): wd.commit_testfile() wd('hg up 0') wd.commit_testfile() - wd('hg merge') + wd('hg merge --tool :merge') assert wd.version is not None |