Groups > linux.debian.maint.python > #17181

Re: Patch that should apply cleanly doesn't using gbp pq import

Path	csiph.com!weretis.net!feeder8.news.weretis.net!news.samoylyk.net!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Andrey Rakhmatullin <wrar@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: Patch that should apply cleanly doesn't using gbp pq import
Date	Thu, 20 Nov 2025 18:40:01 +0100
Message-ID	<LTgNr-eqyC-17@gated-at.bofh.it> (permalink)
References	<LTgNr-eqyC-19@gated-at.bofh.it>
X-Mailbox-Line	From debian-python-request@lists.debian.org Thu Nov 20 17:36:53 2025
Old-Return-Path	<wrar@debian.org>
X-Amavis-Spam-Status	No, score=-11.998 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LDO_WHITELIST=-5, PGPSIGNATURE=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -3.5
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Xwwml32/rgEJZdKn"
Content-Disposition	inline
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/23398
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/aR9RohjqiBp0NrTg@belkar.wrar.name
Approved	robomod@news.nic.it
Lines	104
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Thu, 20 Nov 2025 22:36:34 +0500
X-Original-Message-ID	<aR9RohjqiBp0NrTg@belkar.wrar.name>
X-Original-References	<0a86b79dbc4e918b6bb11e5ef33165ba986e5e56.camel@aeliton.com>
Xref	csiph.com linux.debian.maint.python:17181

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

On Thu, Nov 20, 2025 at 02:05:01PM -0300, Aeliton G. Silva wrote:
>I'm proceeding with my learning process of packaging a new upstream
>version of python-lsp-server and a question came up:
>
>Question A: What to do when gbp pq import/rebase fails applying a patch
>that should apply cleanly? Can I just apply the patch using other means
>(patch or git apply -3) and move on?

You can do anything that works for you as long as the resulting 
debian/patches is correct, as that's the only thing actually published.

>Question B: And if a patch requires tweaking to apply, what is the
>recommended procedure?

Rebasing the old patch-queue branch. If you don't have one, generate it 
with gbp pq import --time-machine=<something>.

>More details about Question A:
>
>The following steps were executed on debian/testing (forky), git
>version is 2.51.0 and everything I did was:
>
>1. Checkout the repo
>
>debcheckout -a python-lsp-server
>cd python-lsp-server
>
>2. Make sure we have the branches locally, or gbp import-orig will
>complain
>
>git checkout pristine-tar
>git checkout upstream
>git checkout debian/master

gbp clone vcs-git:python-lsp-server

>3. Get the new upstream version (v1.13.2)
>
>gbp import-orig --pristine-tar --uscan

You don't need to pass --pristine-tar explicitly when debian/gbp.conf 
already enables it.

>
>4. Rebase / import
>
>gbp pq rebase


>
>The step 4 fail to applying debian/patches/0002-Increase-test-
>timeout.patch, which applies cleanly using either:
>
>patch -p1 < debian/patches/0002-Increase-test-timeout.patch

No, it applies with fuzz.

>or
>
>git apply -3 debian/patches/0002-Increase-test-timeout.patch

Try without -3.

>I've checked the sources of gbp and what it does to apply the patch is:
>
>git apply --index --whitespace=fix debian/patches/0002-Increase-test-
>timeout.patch
>
>Which in my view should apply the patch cleanly, but I can't explain
>why it doesn't.

It doesn't, because the patch cannot be applied cleanly.

-- 
WBR, wRAR

Back to linux.debian.maint.python | Previous | Next | Find similar

Thread

Re: Patch that should apply cleanly doesn't using gbp pq import Andrey Rakhmatullin <wrar@debian.org> - 2025-11-20 18:40 +0100

csiph-web