pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/py-mercurial
Module Name: pkgsrc
Committed By: joerg
Date: Fri May 25 13:04:56 UTC 2018
Modified Files:
pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
pkgsrc/devel/py-mercurial/patches: patch-mercurial_bundle2.py
patch-tests_test-bundle.t patch-tests_test-clonebundles.t
patch-tests_test-http-bad-server.t
patch-tests_test-lfs-serve-access.t
patch-tests_test-obsolete-changeset-exchange.t
patch-tests_test-patchbomb.t patch-tests_test-rebase-conflicts.t
patch-tests_test-strip.t
Log Message:
Make bundles compatible with older hg versions. Bump revision.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/py-mercurial/patches/patch-mercurial_bundle2.py \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-bundle.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-clonebundles.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-http-bad-server.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-lfs-serve-access.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-obsolete-changeset-exchange.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-patchbomb.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-rebase-conflicts.t \
pkgsrc/devel/py-mercurial/patches/patch-tests_test-strip.t
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.21 pkgsrc/devel/py-mercurial/Makefile:1.22
--- pkgsrc/devel/py-mercurial/Makefile:1.21 Tue Jan 16 09:24:56 2018
+++ pkgsrc/devel/py-mercurial/Makefile Fri May 25 13:04:56 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2018/01/16 09:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/05/25 13:04:56 joerg Exp $
DISTNAME= mercurial-${VERSION}
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel scm
MASTER_SITES= https://www.mercurial-scm.org/release/
Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.64 pkgsrc/devel/py-mercurial/distinfo:1.65
--- pkgsrc/devel/py-mercurial/distinfo:1.64 Sun May 20 10:23:02 2018
+++ pkgsrc/devel/py-mercurial/distinfo Fri May 25 13:04:56 2018
@@ -1,6 +1,15 @@
-$NetBSD: distinfo,v 1.64 2018/05/20 10:23:02 wiz Exp $
+$NetBSD: distinfo,v 1.65 2018/05/25 13:04:56 joerg Exp $
SHA1 (mercurial-4.6.tar.gz) = 00b218892e244e549c6a1987a43e831951d7df2e
RMD160 (mercurial-4.6.tar.gz) = 8ec766dc74c65d6540290c1d1f6e5093fae0a7e8
SHA512 (mercurial-4.6.tar.gz) = 2a7e94a338727afc97aab9c33ce4810a17088f5f477a83b581dcbf594e455062e69e6a3782f1665b24ffc011963b0eead6f7e637a63f241d256378d30b006c45
Size (mercurial-4.6.tar.gz) = 6226745 bytes
+SHA1 (patch-mercurial_bundle2.py) = 34548c7e02933bed8613d8732c0c5dcea01841f1
+SHA1 (patch-tests_test-bundle.t) = 6dca93568f21ae407aad03cb5e8c820385d5f998
+SHA1 (patch-tests_test-clonebundles.t) = 0beb9bcd172513d60fd0ba790b1aef524ae60087
+SHA1 (patch-tests_test-http-bad-server.t) = 110f43f13d639ad75a1a9ce3ae7a1cfdecef3ed6
+SHA1 (patch-tests_test-lfs-serve-access.t) = a3a08489c3f1a72835bbd0d2f598146c3c9a2316
+SHA1 (patch-tests_test-obsolete-changeset-exchange.t) = 4ae81fe1f76d30558197ac8276e0889440483e75
+SHA1 (patch-tests_test-patchbomb.t) = a71d8925eaa79b9d12821654e6eed8a997dc1f34
+SHA1 (patch-tests_test-rebase-conflicts.t) = 037be577490e66506ca793857308ea6dcd89d9b8
+SHA1 (patch-tests_test-strip.t) = 9fd2985744d915e57644be358d1b139a37891720
Added files:
Index: pkgsrc/devel/py-mercurial/patches/patch-mercurial_bundle2.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-mercurial_bundle2.py:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-mercurial_bundle2.py Fri May 25 13:04:56 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-mercurial_bundle2.py,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- mercurial/bundle2.py.orig 2018-05-05 23:02:57.000000000 +0000
++++ mercurial/bundle2.py
+@@ -1659,7 +1659,8 @@ def addpartrevbranchcache(repo, bundler,
+ for n in sorted(closed):
+ yield n
+
+- bundler.newpart('cache:rev-branch-cache', data=generate())
++ bundler.newpart('cache:rev-branch-cache', data=generate(),
++ mandatory=False)
+
+ def _formatrequirementsspec(requirements):
+ return urlreq.quote(','.join(sorted(requirements)))
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-bundle.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-bundle.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-bundle.t Fri May 25 13:04:56 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-bundle.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-bundle.t.orig 2018-05-05 23:02:57.000000000 +0000
++++ tests/test-bundle.t
+@@ -803,7 +803,7 @@ bundle single branch
+ bundling: b 1/3 files (33.33%)
+ bundling: b1 2/3 files (66.67%)
+ bundling: x 3/3 files (100.00%)
+- bundle2-output-part: "cache:rev-branch-cache" streamed payload
++ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
+
+ #if repobundlerepo
+ == Test for issue3441
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-clonebundles.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-clonebundles.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-clonebundles.t Fri May 25 13:04:56 2018
@@ -0,0 +1,39 @@
+$NetBSD: patch-tests_test-clonebundles.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-clonebundles.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-clonebundles.t
+@@ -186,10 +186,10 @@ by old clients.
+ 0150: 88 75 34 36 75 04 82 55 17 14 36 a4 38 10 04 d8 |.u46u..U..6.8...|
+ 0160: 21 01 9a b1 83 f7 e9 45 8b d2 56 c7 a3 1f 82 52 |!......E..V....R|
+ 0170: d7 8a 78 ed fc d5 76 f1 36 25 81 89 c7 ad ec 90 |..x...v.6%......|
+- 0180: 54 47 75 2b 89 48 b1 b2 62 ce 8e ce 1e ae 56 41 |TGu+.H..b.....VA|
+- 0190: ae 61 ba 4e 41 8e 7e ce 1e ba 60 01 a0 14 23 58 |.a.NA.~...`...#X|
++ 0180: 54 47 75 2b 89 48 b1 b2 62 c9 89 c9 19 a9 56 45 |TGu+.H..b.....VE|
++ 0190: a9 65 ba 49 45 89 79 c9 19 ba 60 01 a0 14 23 58 |.e.IE.y...`...#X|
+ 01a0: 81 35 c8 7d 40 cc 04 e2 a4 a4 a6 25 96 e6 94 60 |.5.}@......%...`|
+- 01b0: 33 17 5f 54 00 00 01 1b 0a ec |3._T......|
++ 01b0: 33 17 5f 54 00 00 d3 1b 0d 4c |3._T.....L|
+
+ $ echo "http://localhost:$HGPORT1/full.hg"; > server/.hg/clonebundles.manifest
+ $ hg clone -U http://localhost:$HGPORT full-bundle
+@@ -530,14 +530,14 @@ Test clone bundle retrieved through bund
+ $ cat hg.pid >> $DAEMON_PIDS
+
+ $ hg -R server debuglfput gz-a.hg
+- 14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5
++ 1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae
+
+ $ cat > server/.hg/clonebundles.manifest << EOF
+- > largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5 BUNDLESPEC=gzip-v2
++ > largefile://1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae BUNDLESPEC=gzip-v2
+ > EOF
+
+ $ hg clone -U http://localhost:$HGPORT largefile-provided --traceback
+- applying clone bundle from largefile://14ee2f0b3f1d14aeeb2fe037e09fc295c3cf59f5
++ applying clone bundle from largefile://1f74b3d08286b9b3a16fb3fa185dd29219cbc6ae
+ adding changesets
+ adding manifests
+ adding file changes
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-http-bad-server.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-http-bad-server.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-http-bad-server.t Fri May 25 13:04:56 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-tests_test-http-bad-server.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-http-bad-server.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-http-bad-server.t
+@@ -857,7 +857,7 @@ This is before the 0 size chunked transf
+ write(41 from 41) -> (125) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc)
+ write(9 from 9) -> (116) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
+ write(9 from 9) -> (107) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc)
+- write(35 from 35) -> (72) 1d\\r\\n\x16CACHE:REV-BRANCH-CACHE\x00\x00\x00\x03\x00\x00\\r\\n (esc)
++ write(35 from 35) -> (72) 1d\\r\\n\x16cache:rev-branch-cache\x00\x00\x00\x03\x00\x00\\r\\n (esc)
+ write(9 from 9) -> (63) 4\\r\\n\x00\x00\x00'\\r\\n (esc)
+ write(45 from 45) -> (18) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc)
+ write(9 from 9) -> (9) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
+@@ -901,7 +901,7 @@ Server sends a size 0 chunked-transfer s
+ write(41 from 41) -> (128) 23\\r\\n\x08LISTKEYS\x00\x00\x00\x02\x01\x00 namespacebookmarks\\r\\n (esc)
+ write(9 from 9) -> (119) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
+ write(9 from 9) -> (110) 4\\r\\n\x00\x00\x00\x1d\\r\\n (esc)
+- write(35 from 35) -> (75) 1d\\r\\n\x16CACHE:REV-BRANCH-CACHE\x00\x00\x00\x03\x00\x00\\r\\n (esc)
++ write(35 from 35) -> (75) 1d\\r\\n\x16cache:rev-branch-cache\x00\x00\x00\x03\x00\x00\\r\\n (esc)
+ write(9 from 9) -> (66) 4\\r\\n\x00\x00\x00'\\r\\n (esc)
+ write(45 from 45) -> (21) 27\\r\\n\x00\x00\x00\x07\x00\x00\x00\x01\x00\x00\x00\x00default\x96\xee\x1dsT\xc4\xadsr\x04vr\xc3j\x1fV\x1e:jL\\r\\n (esc)
+ write(9 from 9) -> (12) 4\\r\\n\x00\x00\x00\x00\\r\\n (esc)
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-lfs-serve-access.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-lfs-serve-access.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-lfs-serve-access.t Fri May 25 13:04:56 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-lfs-serve-access.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-lfs-serve-access.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-lfs-serve-access.t
+@@ -93,7 +93,7 @@ Blob URIs are correct when --prefix is u
+ bundle2-input-part: "listkeys" (params: 1 mandatory) supported
+ bundle2-input-part: "phase-heads" supported
+ bundle2-input-part: total payload size 24
+- bundle2-input-part: "cache:rev-branch-cache" supported
++ bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
+ bundle2-input-part: total payload size 39
+ bundle2-input-bundle: 3 parts total
+ checking for updated bookmarks
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-obsolete-changeset-exchange.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-obsolete-changeset-exchange.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-obsolete-changeset-exchange.t Fri May 25 13:04:56 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-tests_test-obsolete-changeset-exchange.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-obsolete-changeset-exchange.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-obsolete-changeset-exchange.t
+@@ -159,7 +159,7 @@ client only pulls down 1 changeset
+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
+ bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
+ bundle2-output-part: "phase-heads" 24 bytes payload
+- bundle2-output-part: "cache:rev-branch-cache" streamed payload
++ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
+ bundle2-input-bundle: with-transaction
+ bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
+ adding changesets
+@@ -172,7 +172,7 @@ client only pulls down 1 changeset
+ bundle2-input-part: "listkeys" (params: 1 mandatory) supported
+ bundle2-input-part: "phase-heads" supported
+ bundle2-input-part: total payload size 24
+- bundle2-input-part: "cache:rev-branch-cache" supported
++ bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
+ bundle2-input-part: total payload size 39
+ bundle2-input-bundle: 3 parts total
+ checking for updated bookmarks
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-patchbomb.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-patchbomb.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-patchbomb.t Fri May 25 13:04:56 2018
@@ -0,0 +1,32 @@
+$NetBSD: patch-tests_test-patchbomb.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-patchbomb.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-patchbomb.t
+@@ -388,15 +388,15 @@ test bundle and description:
+ Content-Disposition: attachment; filename="bundle.hg"
+ Content-Transfer-Encoding: base64
+
+- SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1kHdO0GAAAN////vFcSXL9/8H7R09C/578I
+- Ak0E4pe4SIIIgQSgGEQOcLABGYYNKiaaZGEyYjJhGTTRpiHogxGmTRiGRkNMIwhhPSbQJtpQiJkn
+- poyk9I0PUeoNNNBkeUAHqGgD0Ro0NNBoBoaMagNBoNCpNPUemp6QGmgyaPSGmQxGhkZDQbUaBkHp
+- MhoaANNMhkIyIauvSJPL4aUXjIQemQXkoaqOKqAQDIABsZALnf0yCLAyvmktzDWBCVHO6bb6kCqE
+- ZobVEhmMBjs0oQzekgs6PgZSyII8zy9mmG9To49ZlN6TaX5BxlS7cJiuICUdyjNQPIIdQs1Qqqqk
+- JZ2/BksYcU4HQyssZcpkoMco6gRc888KF9BO7BvuSuIPz7A4crBoaQB+euFU1ilz8yIBBmNBDgRX
+- pVh4zkmPiSKcqRJxcshMqh0vkKlgQDTcOujtdmnMVBZfQiPPemcHm2098VJyHBAOqOwluyIKyG92
+- JAR0CCu9SB5q9DyPHUdc5yB5CurIZHt3GM0dCiQRIN0EAcQNmTYTiHdi6B6Dc/ma0hrmSCQXBzfU
+- BEwthEg0YGaJf4u5IpwoSAO6doMA
++ SEcyMAAAAA5Db21wcmVzc2lvbj1CWkJaaDkxQVkmU1l91TAVAAAN////vFcSXL9/8H7R09C/578I
++ Ak0E4pe4SIIIgQSgGEQOcLABGYYNKgJgmhpp6mmjIZMCZNMhpgBBpkaYJpo9QaZMg02iaY2lCImK
++ emk02kmEAeoA0D01ANBoHqHqADTaj1NAAyZqA0Gg0KiYnqaepk0eoNDTCGj1A0eoyBoGjRkYBqAB
++ poNMmhkBhENSP0knlYZbqyEIYxkFdpDUS6roBDMgAGhkAqd92kEcgyeMo2MM366gpLNHjfKrhJPN
++ vdBCHAEDsYzAvzkHKxy5KWBAmh5e1nFttGChpsxrgmutRG0YrsSLWEBH9h95cbZEKFeUKYykRXHa
++ Bkt2OSgELsqqnWKeMudBR+YSZCOSHrwPz7B/Gfou7/L6QV6S0IgclBCitBVHMxMFq/vGwp5WHezM
++ JwhKTnH0OkMbmVjrAkQKR7VM2aNSXn+GzLOCzOQm0AJ1TLCpdSgnfFPcY7mGxAOyHXS1YEFVi5O9
++ I4EVBBd8VRgN4n1MAm8l6QQ+yB60hkeX/0ZZmKoQRINkEBxEDZU2HjIZMcwWRvZtbRIa5kgkGIb/
++ SkImFwIkDtQxyX+LuSKcKEg+6pgKgA==
+ --===============*==-- (glob)
+
+ with a specific bundle type
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-rebase-conflicts.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-rebase-conflicts.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-rebase-conflicts.t Fri May 25 13:04:56 2018
@@ -0,0 +1,34 @@
+$NetBSD: patch-tests_test-rebase-conflicts.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-rebase-conflicts.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-rebase-conflicts.t
+@@ -298,7 +298,7 @@ Check that the right ancestors is used w
+ 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
+ bundle2-output-bundle: "HG20", (1 params) 3 parts total
+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
+- bundle2-output-part: "cache:rev-branch-cache" streamed payload
++ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
+ bundle2-output-part: "phase-heads" 24 bytes payload
+ saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg
+ 3 changesets found
+@@ -308,7 +308,7 @@ Check that the right ancestors is used w
+ 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
+ bundle2-output-bundle: "HG20", 3 parts total
+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
+- bundle2-output-part: "cache:rev-branch-cache" streamed payload
++ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
+ bundle2-output-part: "phase-heads" 24 bytes payload
+ adding branch
+ bundle2-input-bundle: with-transaction
+@@ -322,7 +322,7 @@ Check that the right ancestors is used w
+ adding f1.txt revisions
+ added 2 changesets with 2 changes to 1 files
+ bundle2-input-part: total payload size 1686
+- bundle2-input-part: "cache:rev-branch-cache" supported
++ bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
+ bundle2-input-part: total payload size 74
+ truncating cache/rbc-revs-v1 to 56
+ bundle2-input-part: "phase-heads" supported
Index: pkgsrc/devel/py-mercurial/patches/patch-tests_test-strip.t
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_test-strip.t:1.1
--- /dev/null Fri May 25 13:04:56 2018
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_test-strip.t Fri May 25 13:04:56 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_test-strip.t,v 1.1 2018/05/25 13:04:56 joerg Exp $
+
+Merge 326b174c6a47 from upstream:
+bundle2: mark the bundle2 part as advisory (issue5872)
+
+--- tests/test-strip.t.orig 2018-05-05 23:02:58.000000000 +0000
++++ tests/test-strip.t
+@@ -851,7 +851,7 @@ check strip behavior
+ d8db9d1372214336d2b5570f20ee468d2c72fa8b
+ bundle2-output-bundle: "HG20", (1 params) 3 parts total
+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
+- bundle2-output-part: "cache:rev-branch-cache" streamed payload
++ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
+ bundle2-output-part: "phase-heads" 24 bytes payload
+ saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
+ updating the branch cache
Home |
Main Index |
Thread Index |
Old Index