On Sat, May 31, 2025 at 01:35:31PM +0200, Marc Haber wrote:
[31/4931]mh@salida:~/packages/ferm/ferm (debian/latest|u+2) $ gbp pq import gbp:info: Trying to apply patches at 'a154bfe4f897bbe8dc738b30824148f1aeaf89f2' gbp:warning: Patch 0001-Fix-deferred-functions-within-target-arguments.patch failed to apply, retrying with whitespace fixup gbp:error: Failed to apply '/home/mh/packages/ferm/ferm/debian/patches/0001-Fix-deferred-functions-within-target-arguments.patch': Error running git apply: warning: src/ferm has type 100755, expected 100644 error: patch failed: src/ferm:548 error: src/ferm: patch does not apply error: patch failed: test/misc/ipfilter.ferm:10 error: test/misc/ipfilter.ferm: patch does not apply error: patch failed: test/misc/ipfilter.result:2 error: test/misc/ipfilter.result: patch does not apply gbp:error: Couldn't apply patches 1 [32/4932]mh@salida:~/packages/ferm/ferm (debian/latest|u+2) $ So does gbp pq rebase (same result).In a traditional workflow, I would now install quilt, run quilt push --force and sort out the rejects followed by a quilt refresh.How am I supposed to handle this in a modern workflow?
gbp pq import --time-machine=<something> and rebase them via the familiar git rebase interface that will be shown.
-- WBR, wRAR
Attachment:
signature.asc
Description: PGP signature