Your message dated Sat, 12 Nov 2022 01:48:58 +0000 with message-id <[email protected]> and subject line Bug#1019454: fixed in dgit 10.1 has caused the Debian Bug report #1019454, regarding dgit push-built --quilt=unapplied should auto-create separate dgit view like push-source does to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 1019454: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019454 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: dgit Version: 10.0 Severity: normal I'm using git-buildpackage (gbp pq) as my maintainer workflow, with a patches-unapplied maintainer view, and doing uploads with dgit. I'm not using dgit's sbuild/debuild integration, because I have my own build tool (vectis) which does the build in a VM and runs QA tools like autopkgtest and piuparts on it, and in any case I don't want to upload until I have tested the exact version I plan to upload, which sometimes involves a logout/login, a reboot, or extended testing; so my input to dgit is a git checkout and a sourceful changes file from a previous run of my build tool, which dgit will helpfully confirm to be identical to stop me from making mistakes. Normally, for source-only uploads, I do this: dgit push-source -C ~/tmp/build-area/foo_latest/*_source.changes and that works quite smoothly: dgit automatically updates the dgit-intern/quilt-cache ref by importing my patch series with gbp pq, does a pseudo-merge to mark the new version as a fast-forward from the old version, does the upload and push, and leaves me in my maintainer view ready to do a `gbp push` to salsa: > $ dgit push-source -C .../*_source.changes > Format `3.0 (quilt)', need to check/update patch stack > canonical suite name for unstable is sid > dgit: split brain (separate dgit view) may be needed (--quilt=unapplied). > examining quilt state (multiple patches, unapplied mode) > dgit: base trees orig=83dbd628ffbf55c54139 o+d/p=7aca0c8974f6e8fd9465 > dgit: quilt differences: src: == orig ## gitignores: == orig == > dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p > dgit view: creating patches-applied version using gbp pq > dgit view: created (commit id 559577a17b9ce2f8c5309f5e116d627f68a191ce) > last upload to archive: specified git info (debian) > using existing gnome-shell-extension-top-icons-plus_27.orig.tar.gz > dgit: split brain (separate dgit view) may be needed (--quilt=unapplied). > dgit view: found cached (commit id 559577a17b9ce2f8c5309f5e116d627f68a191ce) > Checking that HEAD includes all changes in archive... > Declaring that HEAD includes all changes in 27-7... > Made pseudo-merge of 27-7 into dgit view. > checking that gnome-shell-extension-top-icons-plus_27-8.dsc corresponds to > HEAD > ... > Successfully uploaded packages. > dgit ok: pushed and uploaded 27-8 However, when I'm doing an upload to NEW, I need to upload a full changes file with source and some combination of binaries from architectures amd64, i386 and/or all, which in my case is the result of merging individual builds' changes files with mergechanges(1): dgit push-built -C ~/tmp/build-area/foo_latest/*_source+binary.changes --new and that currently fails: > $ dgit push-built -C .../*_source+binary.changes --new > Format `3.0 (quilt)', need to check/update patch stack > canonical suite name for unstable is sid > no version available from the archive > dgit: split brain (separate dgit view) may be needed (--quilt=unapplied). > > dgit: error: --quilt=unapplied but no cached dgit view: > dgit: perhaps HEAD changed since dgit build[-source] ? > ! Push failed, while preparing your push. > ! You can retry the push, after fixing the problem, if you like. Workaround: first do something like dgit push-source -C .../*_source.changes --dry-run which in this case detects that I'm going to upload to NEW, and fails with "package appears to be new in this suite; if this is intentional, use --new", but not until after it has had the side-effect of updating dgit-intern/quilt-cache to the content I need to be able to repeat the push-built command successfully. Would it be possible to make push-built do the same automatic fixup as push-source? Thanks, smcv -- System Information: Debian Release: bookworm/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'stable-security'), (500, 'oldstable-debug'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') merged-usr: no Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.19.0-1-amd64 (SMP w/4 CPU threads; PREEMPT) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE=en_GB:en Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages dgit depends on: ii apt 2.5.2 ii ca-certificates 20211016 ii coreutils 8.32-4.1 ii curl 7.85.0-1 ii devscripts 2.22.2 ii dpkg-dev 1.21.9 ii dput 1.1.2 ii git [git-core] 1:2.37.2-1 ii git-buildpackage 0.9.28 ii libdpkg-perl 1.21.9 ii libjson-perl 4.09000-1 ii liblist-moreutils-perl 0.430-2 ii liblocale-gettext-perl 1.07-4+b2 ii libtext-csv-perl 2.02-1 ii libtext-glob-perl 0.11-2 ii libtext-iconv-perl 1.7-7+b2 ii libwww-curl-perl 4.17-7+b2 ii perl [libdigest-sha-perl] 5.34.0-5 Versions of packages dgit recommends: ii distro-info-data 0.54 ii liburi-perl 5.12-1 ii openssh-client [ssh-client] 1:9.0p1-1+b1 Versions of packages dgit suggests: ii cowbuilder 0.89 ii pbuilder 0.231 ii sbuild 0.83.2 -- no debconf information
--- End Message ---
--- Begin Message ---Source: dgit Source-Version: 10.1 Done: Ian Jackson <[email protected]> We believe that the bug you reported is fixed in the latest version of dgit, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Ian Jackson <[email protected]> (supplier of updated dgit package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 11 Nov 2022 23:53:28 +0000 Source: dgit Architecture: source Version: 10.1 Distribution: unstable Urgency: medium Maintainer: Ian Jackson <[email protected]> Changed-By: Ian Jackson <[email protected]> Closes: 941323 1019454 Changes: dgit (10.1) unstable; urgency=medium . Bugfixes to dgit: * dgit push-build: Populate the split brain cache if necessary Closes:#1019454. [Report from Simon McVittie] . Bugfixes to git-debrebase [reports from David Bremner]: * git-debrebase: Fix "stripeoch" bug in convert-from-dgit-view. * git-debrebase: Fix handling of tag during convert-from-dgit-view. * git-debrebase: convert-from-dgit-view: Bail if output is wrong eg due to lack of appropriate d/patches. . Documentation and messages: * dgit: Soften message about source-only uploads to NEW. [Report from Simon McVittie] Improves #983056 a bit. * dgit(1): Be more encouraging about --new. Closes:#941323. * dgit(1): Remove obsolete documentation of dgit-tag-format [Remark from Philip Hands in #1023468] * dgit-maint-debrebase(7): add --pretty example for generating hash tags for upstream versions. [Philip Hands] * git-debrebase: conversion: bail a little earlier on snags. . Infrastructure (dgit-repos, server side): * get-dm-txt: Handle abolition of archive-query-tls-curl-ca-args (fixes incompatibility with deployed production configuration). . Packaging: * New elements to test cases to test some of the fixes. * changelog: Fix misindented line in entry for 9.11. * changelog: Retrospectively xref to #950612 in entry for 9.11. Checksums-Sha1: 2010376eb258881592c442837857cd3602ab6e4f 1846 dgit_10.1.dsc 66d396aae6fb3cb0b0e1fc07daccea6d02a1cf82 670325 dgit_10.1.tar.gz Checksums-Sha256: 8dcef42f63cc8a21f10af01fe36a2eede87a2eaddf994570078d424d24d7a2da 1846 dgit_10.1.dsc f0ab34815ef8c8565745bc535c819615ac0d3e27686103c64ece553d6ff5bd80 670325 dgit_10.1.tar.gz Files: 98ecea2d68299f4815dcf6074e5b2515 1846 devel optional dgit_10.1.dsc e25b3daf9e2251f4bf4b582b8b1e16a0 670325 devel optional dgit_10.1.tar.gz -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmNu9pMACgkQ4+M5I0i1 DTnYLAgAxNyTXsZOkEt9of2Tk0TrWwvSk+j0PzCZM+riSI9IQTW/qGJJ8CfPWLwY QPUfe/njEmDMs/DHc9ngVz4WPwOfoSkzOsTAi6rx3IhzZWh5G/X9hxmzIeJ7okCi flNih1/bvIGFXFMqniG1E9hFp1Y8qML2yt4PRxgOAxmHfhAmjyy7T56GlHFpnSaC lHMJ+vQWytdOR/IpYmFtEmiLWyT/HkxkjWuaD16wf9gbwtIpsCVpH4sGuSAgiNlQ 99Mos+8wIpaOq8cNpUtDP3p5dTVrYQmv3ct1q7LkBICbBN2/LZDO2Erc5dMm8yFS tsJzdQiwEbAVenEiWRB4lYsx4QQ5ww== =aJHo -----END PGP SIGNATURE-----
--- End Message ---
