diff options
| author | wiz <wiz@pkgsrc.org> | 2019-08-18 08:35:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-08-18 08:35:47 +0000 |
| commit | 5ee18df157dc7015fe44003a7b54d19fe523875b (patch) | |
| tree | e5a09b124b84d06de6fcdec7fe3bda4d197e8619 /devel/py-mercurial | |
| parent | 73a304bf09648c82eafff8ac68fa36f4467b7699 (diff) | |
| download | pkgsrc-5ee18df157dc7015fe44003a7b54d19fe523875b.tar.gz | |
py-mercurial: add an upstream patch that fixes a test case on *BSD.
Diffstat (limited to 'devel/py-mercurial')
| -rw-r--r-- | devel/py-mercurial/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-mercurial/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-mercurial/patches/patch-tests_test-merge-combination.t | 16 |
3 files changed, 19 insertions, 4 deletions
diff --git a/devel/py-mercurial/Makefile b/devel/py-mercurial/Makefile index 67bce39f83d..ab64a5b1350 100644 --- a/devel/py-mercurial/Makefile +++ b/devel/py-mercurial/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/08/16 12:59:02 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2019/08/18 08:35:47 wiz Exp $ DISTNAME= mercurial-${VERSION} PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,8 +26,6 @@ INSTALLATION_DIRS+= share/doc/mercurial # Known test failures: # test-narrow-shallow (sometimes): # https://bz.mercurial-scm.org/show_bug.cgi?id=6150 -# test-merge-combination: -# https://bz.mercurial-scm.org/show_bug.cgi?id=6186 do-test: cd ${WRKSRC} && make tests PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo index e501f9bbdb3..8215c13edc1 100644 --- a/devel/py-mercurial/distinfo +++ b/devel/py-mercurial/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.78 2019/08/16 12:59:02 wiz Exp $ +$NetBSD: distinfo,v 1.79 2019/08/18 08:35:47 wiz Exp $ SHA1 (mercurial-5.1.tar.gz) = 516800a18bb4e81ba6e4ba5d12cc5807d51bcc0a RMD160 (mercurial-5.1.tar.gz) = 23f05ca435a332a9db0e1f42f4841656d463acdf SHA512 (mercurial-5.1.tar.gz) = cf7a64a181eeb3dc8f24067ea032fb17504358a9ed08cb50ac041e66ef20426c060d997cb5d30e7582874135b0a351b3e58d7297aaa4e009aabbf562a1ab9fae Size (mercurial-5.1.tar.gz) = 7283396 bytes +SHA1 (patch-tests_test-merge-combination.t) = 3753d014c17a16c9cdc0fdb0aa11739980fc5d9f diff --git a/devel/py-mercurial/patches/patch-tests_test-merge-combination.t b/devel/py-mercurial/patches/patch-tests_test-merge-combination.t new file mode 100644 index 00000000000..8a2e3d3451b --- /dev/null +++ b/devel/py-mercurial/patches/patch-tests_test-merge-combination.t @@ -0,0 +1,16 @@ +$NetBSD: patch-tests_test-merge-combination.t,v 1.1 2019/08/18 08:35:47 wiz Exp $ + +Fix test case on *BSD. +https://phab.mercurial-scm.org/D6729 + +--- tests/test-merge-combination.t.orig 2019-08-01 16:14:49.000000000 +0000 ++++ tests/test-merge-combination.t +@@ -57,7 +57,7 @@ revision. "C" indicates that hg merge ha + > fi + > else expected=a + > fi +- > got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '` ++ > got=`hg log -r 3 --template '{files}\n' | tr -d 'e '` + > if [ "$got" = "$expected" ] + > then echo "$line$conflicts: agree on \"$got\"" + > else echo "$line$conflicts: hg said \"$got\", expected \"$expected\"" |