Mon Aug 3 21:52:55 2020 UTC ()
Belatedly update patch to not fail test suite.


(joerg)
diff -r1.1 -r1.2 pkgsrc/devel/py-mercurial/patches/patch-D8480
cvs diff -r1.1 -r1.2 pkgsrc/devel/py-mercurial/patches/Attic/patch-D8480 (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/patches/Attic/patch-D8480 2020/05/24 01:16:26 1.1
+++ pkgsrc/devel/py-mercurial/patches/Attic/patch-D8480 2020/08/03 21:52:55 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-D8480,v 1.1 2020/05/24 01:16:26 joerg Exp $ 1$NetBSD: patch-D8480,v 1.2 2020/08/03 21:52:55 joerg Exp $
2 2
3# HG changeset patch 3# HG changeset patch
4# User Joerg Sonnenberger <joerg@bec.de> 4# User Joerg Sonnenberger <joerg@bec.de>
5# Date 1587738964 -7200 5# Date 1587738964 -7200
6# Fri Apr 24 16:36:04 2020 +0200 6# Fri Apr 24 16:36:04 2020 +0200
7# Branch stable 7# Branch stable
8# Node ID 8467bb8885f5468abba2ed57d3476d04fd8fb426 8# Node ID 8467bb8885f5468abba2ed57d3476d04fd8fb426
9# Parent edffab2cf0ead5140fdaa391c1c827ddc53dfe35 9# Parent edffab2cf0ead5140fdaa391c1c827ddc53dfe35
10bundle: make obsolescence parts optional 10bundle: make obsolescence parts optional
11 11
12It is useful to ship obsolescence markers as part of clonebundles or 12It is useful to ship obsolescence markers as part of clonebundles or
13pullbundles, but they shouldn't stop a non-evolution client from 13pullbundles, but they shouldn't stop a non-evolution client from
14working. Marking the part as optional is enough to ensure this. 14working. Marking the part as optional is enough to ensure this.
@@ -126,27 +126,27 @@ diff -r edffab2cf0ea -r 8467bb8885f5 tes @@ -126,27 +126,27 @@ diff -r edffab2cf0ea -r 8467bb8885f5 tes
126@@ -138,14 +138,42 @@ 126@@ -138,14 +138,42 @@
127  127
128 $ hg up 'desc("ROOT")' 128 $ hg up 'desc("ROOT")'
129 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 129 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
130- $ hg pull --confirm --config ui.interactive=True << EOF 130- $ hg pull --confirm --config ui.interactive=True << EOF
131+ $ hg pull --debug --confirm --config ui.interactive=True << EOF 131+ $ hg pull --debug --confirm --config ui.interactive=True << EOF
132 > n 132 > n
133 > EOF 133 > EOF
134 pulling from $TESTTMP/distributed-chain-building/server 134 pulling from $TESTTMP/distributed-chain-building/server
135+ query 1; heads 135+ query 1; heads
136 searching for changes 136 searching for changes
137+ taking quick initial sample 137+ taking quick initial sample
138+ query 2; still undecided: 1, sample size is: 1 138+ query 2; still undecided: 1, sample size is: 1
139+ 2 total queries in 0.0091s 139+ 2 total queries in *.*s (glob)
140+ 1 changesets found 140+ 1 changesets found
141+ list of changesets: 141+ list of changesets:
142+ 391a2bf12b1b8b05a72400ae36b26d50a091dc22 142+ 391a2bf12b1b8b05a72400ae36b26d50a091dc22
143+ listing keys for "bookmarks" 143+ listing keys for "bookmarks"
144+ bundle2-output-bundle: "HG20", 5 parts total 144+ bundle2-output-bundle: "HG20", 5 parts total
145+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload 145+ bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
146+ bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload 146+ bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
147+ bundle2-output-part: "obsmarkers" streamed payload 147+ bundle2-output-part: "obsmarkers" streamed payload
148+ bundle2-output-part: "phase-heads" 48 bytes payload 148+ bundle2-output-part: "phase-heads" 48 bytes payload
149+ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload 149+ bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
150+ bundle2-input-bundle: with-transaction 150+ bundle2-input-bundle: with-transaction
151+ bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported 151+ bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
152 adding changesets 152 adding changesets