Your message dated Wed, 27 Jun 2018 13:19:03 +0000 with message-id <e1fyalf-0009uv...@fasolo.debian.org> and subject line Bug#891031: fixed in dgit 5.3 has caused the Debian Bug report #891031, regarding dgit: Please make the unavoidable error message on first push more user-friendly 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 ow...@bugs.debian.org immediately.) -- 891031: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891031 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: dgit Version: 4.3 Severity: minor Tags: upstream Hi, Prodded by Sean Whitton's blog post[1], I decided to give dgit another try. I found an upload I needed to do, and used `dgit push-source --gbp`, only to have that fail with the following tail: > synthesised git commit from .dsc 0.11-5 > dgit: split brain (separate dgit view) may be needed (--quilt=gbp). > dgit view: found cached (commit id a83cdaf57fc92b42d16a912aeedc1633971604c2) > Checking that HEAD inciudes all changes in archive... > dgit: check failed (maybe --overwrite is needed, consult documentation) > dgit: Wanted tag maintainer view tag (debian/0.11-5) on dgit server, but not > found > ! Push failed, while preparing your push. > ! You can retry the push, after fixing the problem, if you like. I suppose this gives an experienced user all the information they need, but for a newcomer this is unparseable. The problem is fixed by passing --overwrite (as correctly suggested), but the phrasing could be improved. An option named --overwrite sounds fairly advanced, when in fact it isn't. Some thoughts: 1. Adding a short blurb indicating common causes of this specific error. AFAICT, the most common causes are: first use of dgit, and incorporating NMUs without dgit use. Something like "This usually happens when the last upload was not done using dgit" would go a long way towards demistifying the new user. 2. It occurs to me this situation can be avoided entirely for some cases if dgit can detect the dgit history is composed entirely of synthesized commits (ie, imports from the debian archive and not dgit pushes), or is empty. I have no idea if this is feasible though. 3. As said, --overwrite sounds potentially data-lossy, but is the only solution to this predicament. Maybe it is desirable to have aliases for the common cases: --first-dgit-push or some such. [1] https://spwhitton.name//blog/entry/pushsourcedropin/ -- System Information: Debian Release: buster/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.14.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages dgit depends on: ii apt 1.6~alpha7 ii ca-certificates 20170717 ii coreutils 8.28-1 ii curl 7.58.0-2 ii devscripts 2.17.12 ii dpkg-dev 1.19.0.5 ii dput 1.0.1 ii git [git-core] 1:2.16.1-1 ii git-buildpackage 0.9.7 ii libdpkg-perl 1.19.0.5 ii libjson-perl 2.97001-1 ii liblist-moreutils-perl 0.416-1+b3 ii libperl5.26 [libdigest-sha-perl] 5.26.1-4+b1 ii libtext-glob-perl 0.10-1 ii libtext-iconv-perl 1.7-5+b6 ii libwww-perl 6.31-1 ii perl 5.26.1-4+b1 Versions of packages dgit recommends: ii openssh-client [ssh-client] 1:7.6p1-4 Versions of packages dgit suggests: ii sbuild 0.73.0-4 -- no debconf information
--- End Message ---
--- Begin Message ---Source: dgit Source-Version: 5.3 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 891...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Ian Jackson <ijack...@chiark.greenend.org.uk> (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 ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Wed, 27 Jun 2018 14:00:31 +0100 Source: dgit Binary: dgit git-debrebase dgit-infrastructure Architecture: all source Version: 5.3 Distribution: unstable Urgency: medium Maintainer: Ian Jackson <ijack...@chiark.greenend.org.uk> Changed-By: Ian Jackson <ijack...@chiark.greenend.org.uk> Closes: 869146 891031 901925 901935 Description: dgit - git interoperability with the Debian archive dgit-infrastructure - dgit server backend infrastructure git-debrebase - rebasing git workflow tool for Debian packaging Changes: dgit (5.3) unstable; urgency=medium . Bugfixes: * dgit: Do not introduce duplicate origs in .changes files, eg if the .changes already has that orig. Closes:#869146. * Honour GIT_REFLOG_ACTION everywhere. Closes:#901935. * git-debrebase new-upstream: Provide better reflog entries by setting GIT_REFLOG_ACTION. Closes:#901925. . Improvements: * Better message formatting when --overwrite may be needed, and a note about first dgit push in dgit(1). Closes:891031. * dgit(7): Add discussion of quilt fixup error messages, and add cross-references to dgit(1) and the actual error. Somewhat apropos of #842614. Checksums-Sha1: ec5e828940d11a4df1308fbe7a170f030a03d771 1607 dgit_5.3.dsc f86d0d2ee7854607583ca322c52fb5cd628f9e92 454175 dgit_5.3.tar.gz 42a0ba5ebe57a01bf7e68faa2b045c47fcebe770 53392 dgit-infrastructure_5.3_all.deb c11a080bfe795a6a879189d7c68597ed03433594 153376 dgit_5.3_all.deb cd0d959fca271f34ae1cf0086a5f737b8f420af3 5608 dgit_5.3_amd64.buildinfo aac2c6661a0a2d3cb1bf593d0f2762c3b20442a7 63452 git-debrebase_5.3_all.deb Checksums-Sha256: 77468fb9511af6ff0080ea3af2cc680375c6239692e496a34c7eb421be8cccae 1607 dgit_5.3.dsc a87a29ed15604915c83754fae80ca6da3d16f4e2d2ec50eb418edfa12bedd7a1 454175 dgit_5.3.tar.gz 2f533dff367ad4a7a8e470767d6122f17e4ed3ddee4a2f42ce55e677a6c8530e 53392 dgit-infrastructure_5.3_all.deb f955c43e021c87dec83138ec0bb730a04ab39d6d61baa5197e78986628365413 153376 dgit_5.3_all.deb b048b983384b36930872422b3652955601e413d9b935e9765e57afb644966a71 5608 dgit_5.3_amd64.buildinfo 9da51bc81839241e4095aa62c157b29ffa3eb1347a14d168e31ffc3ead950fdd 63452 git-debrebase_5.3_all.deb Files: 47ce26834a3c85f519f6896c47f5ae39 1607 devel optional dgit_5.3.dsc bb8c81f23dca4e35f4da12f4a371d169 454175 devel optional dgit_5.3.tar.gz 06ab8326b1d58930252a884d9351f319 53392 devel extra dgit-infrastructure_5.3_all.deb 93beb649302e65a709f6a70440ecf64a 153376 devel optional dgit_5.3_all.deb 2382fa9103477cb227e29b18e9c83e7d 5608 devel optional dgit_5.3_amd64.buildinfo 84333aac981b47a4d0d9480b309c5d02 63452 devel optional git-debrebase_5.3_all.deb -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAlsziw0ACgkQ4+M5I0i1 DTke3Qf/Wi9kz9Xtwit9K0Y0UlxSq2ZqtCiOkexx+NuYxz4bSRiy8QlRwVe97qlu EsvxmiC5ssoEW4vP75Mb9lkhB8CvNjCOkz49VRIaWcgu2PxhAjYwqNBkB9Y0eyeC jfD1306FHFQW0UL9zGXSnMzxL3gn1kc1F0gOqG/GK0ohnvjkJClqpiIfGTQq2KUU m8ELc49RMYdjqfj5LE8GA78u6PvWEwbZiimSPrSZ5oyQ0EI5B5vAT0cb1p7Xn+O1 DadrXiBNo6JUDd61S8tcanhOM1EvuqLETbOFALqwkagxam2idkkHJBkWLAOgOyCr Chw56fP9MtEuY7C2XJwGHeawtbAcKg== =Y7F4 -----END PGP SIGNATURE-----
--- End Message ---
