aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-03-09 16:49:10 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2021-04-05 18:18:06 +0000
commite4d572b87a6a0d3621209cc030402ffbeb3e233c (patch)
tree1b1abfcacde7a2d1cce4f58ba37f2210c5d4a226
parentd15fa50421f4e531524651994d8f6ba84eb5866e (diff)
community/mercurial: blacklist another test that times out
-rw-r--r--community/mercurial/APKBUILD2
-rw-r--r--community/mercurial/blacklist.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/community/mercurial/APKBUILD b/community/mercurial/APKBUILD
index 6c13ea57065..dc13ec23922 100644
--- a/community/mercurial/APKBUILD
+++ b/community/mercurial/APKBUILD
@@ -79,4 +79,4 @@ bashcomp() {
}
sha512sums="ecf1fb38e372acb5e29998cbe1105ecfb846a2bb43254419c89395c52fd28c37abe8eb850584f32f6ef53b539e6a7ef5a4dae10b816b747d20c6b0b4933f4b62 mercurial-5.7.tar.gz
-1818450ef84158f43d570dfcd8402dae344c1cae30f5a945eaabae241f3891e2ca8066f54ea76849cf918f11e6e391c46428839145aabb5694725275a98779a7 blacklist.txt"
+61ef8ac9354a32e56425b8907b88b0e87f8a3cdab60d8ea249fc36b3c9913e0ff1b7e20f94a5abaf4a6bb12a1673de6c8b427f50f19f88080d48efa75bfd7ff1 blacklist.txt"
diff --git a/community/mercurial/blacklist.txt b/community/mercurial/blacklist.txt
index 0d0c6f4a33f..dfe78070bfc 100644
--- a/community/mercurial/blacklist.txt
+++ b/community/mercurial/blacklist.txt
@@ -22,6 +22,7 @@ test-obsolete.t
test-revset.t
test-subrepo.t
test-template-functions.t
+test-merge-combination-file-content.t
# time out on ppc64le
test-annotate.t
test-automv.t