Mercurial > hg-stable
changeset 45674:66cb7ad3787c
branching: merge with stable
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 08 Oct 2020 23:19:01 -0700 |
| parents | 7990e7d957b0 (current diff) 4a146cff76fa (diff) |
| children | 59ab71498bee |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-git.t Thu Oct 01 09:45:00 2020 +0200 +++ b/tests/test-convert-git.t Thu Oct 08 23:19:01 2020 -0700 @@ -1,5 +1,7 @@ #require git + $ echo "[init]" >> $HOME/.gitconfig + $ echo "defaultBranch = master" >> $HOME/.gitconfig $ echo "[core]" >> $HOME/.gitconfig $ echo "autocrlf = false" >> $HOME/.gitconfig $ echo "[core]" >> $HOME/.gitconfig
--- a/tests/test-doctest.py Thu Oct 01 09:45:00 2020 +0200 +++ b/tests/test-doctest.py Thu Oct 08 23:19:01 2020 -0700 @@ -72,6 +72,9 @@ cwd = os.path.dirname(os.environ["TESTDIR"]) +if not os.path.isdir(os.path.join(cwd, ".hg")): + sys.exit(0) + files = subprocess.check_output( "hg files --print0 \"%s\"" % fileset, shell=True, cwd=cwd, ).split(b'\0')