Your message dated Thu, 12 Jul 2018 13:04:03 +0000 with message-id <[email protected]> and subject line Bug#903132: fixed in dgit 5.9 has caused the Debian Bug report #903132, regarding -fdiverged when `git debrebase convert-from-gbp` after `dgit push --gbp` 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.) -- 903132: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903132 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: git-debrebase Version: 5.2 Severity: normal If you have been happily maintaining a package in splitbrain mode and then you decide to `git debrebase convert-from-gbp`, various commands, such as `git debrebase new-upstream`, will require passing -fdiverged, and then your first dgit push will require --overwrite. Either they should not require passing it, or dgit-maint-debrebase(7) should explain that it will be needed. I'm not yet sure which is right. Here is what the problem looks like: spwhitton@iris:~/src/helm>git debrebase convert-from-gbp v2.9.6 gbp:info: Trying to apply patches at '2719a9065dabd08b7e2f8486d1d7d0b6b43db7e8' gbp:info: 3 patches listed in 'debian/patches/series' imported on 'patch-queue/gdr-internal' HEAD is now at 57854290 patch-emacs-helm-sh spwhitton@iris:~/src/helm>git-debrebase new-upstream 2.9.7 OK, you are ahead of refs/remotes/origin/master git-debrebase: snag detected (-fdiverged): you have diverged from refs/remotes/dgit/dgit/sid git-debrebase: error: git-debrebase: snags: 1 blockers (you could -f<tag>, or --force) And to reproduce the failure as I ran into it, repo: https://salsa.debian.org/emacsen-team/helm before `convert-from-gbp`: 2719a9065dabd08b7e2f8486d1d7d0b6b43db7e8 -- Sean Whitton
--- End Message ---
--- Begin Message ---Source: dgit Source-Version: 5.9 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: Thu, 12 Jul 2018 13:37:12 +0100 Source: dgit Binary: dgit git-debrebase dgit-infrastructure Architecture: all source Version: 5.9 Distribution: unstable Urgency: medium Maintainer: Ian Jackson <[email protected]> Changed-By: Ian Jackson <[email protected]> Closes: 842643 851194 901927 903132 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.9) unstable; urgency=medium . * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Closes:#903132. * git-debrebase convert-from-gbp: Check that the result will not count as having diverged. This will usually turn failures to make the ff pseudomerge into -fdiverged. Related to #903132. * git-debrebase, Dgit.pm, git: some internal reorganisation to support git-debrebase changes. * dgit-downstream-dsc(7): New manpage. Closes:#842643,#851194. * git-debrebase(5): Document best gitk options. Closes:#901927. Checksums-Sha1: c16a3e3ef1988a22992aed8ace494cc4df38d0a5 1633 dgit_5.9.dsc 218ee0810fe0a3bd587394627fdafbd71f433a23 464621 dgit_5.9.tar.gz aa01181c62e1b11f35725197050a10946898e19f 55132 dgit-infrastructure_5.9_all.deb 3018bbe140ccb858d43e1355ac8a6fbe9e289ab0 162260 dgit_5.9_all.deb a759efe372038b6cd494cf692f83caf82975d8ff 5662 dgit_5.9_amd64.buildinfo 629718441527d141ac1b89d88ba5d56c73f0c64d 66272 git-debrebase_5.9_all.deb Checksums-Sha256: 0e2e33e2821f672c3548d1b83e3b897a4642fa650f870b7ccc64adc85714db09 1633 dgit_5.9.dsc f6eadcd9e78d72294f4d82cab96b2f29e2952a736297a079cbe7fcbc0ddeca45 464621 dgit_5.9.tar.gz 668b5df205fcb815d56e232056d57a873fa1dd1a2ee930689c969ee9ff04bad7 55132 dgit-infrastructure_5.9_all.deb 47182b4921838c0789f7cd9ca93d317d70544b6f96bb6ca8fc7bdf5234cdc4a5 162260 dgit_5.9_all.deb 0050db87e6e544193bf0e18c25d5babbc07c2ddbbbdc0a9e1abca762eca867e2 5662 dgit_5.9_amd64.buildinfo 04e6e70b20f2045815fcc5162095107ae729a2c60c617d718163f655ea60d567 66272 git-debrebase_5.9_all.deb Files: d3b239b5178c7659352bd10d0ddb8a39 1633 devel optional dgit_5.9.dsc ab18056206def3af8bb7cef127413c2c 464621 devel optional dgit_5.9.tar.gz 64ec22d04f1cc9c46a86e3021ae639a4 55132 devel extra dgit-infrastructure_5.9_all.deb bd4e2f2dea07a19a59c618c171772744 162260 devel optional dgit_5.9_all.deb c89abd6f28067cf4b312747eaf53c9a9 5662 devel optional dgit_5.9_amd64.buildinfo 8d645c8d30a8f5ae06055224165d58c3 66272 devel optional git-debrebase_5.9_all.deb -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAltHTEwACgkQ4+M5I0i1 DTnvpwf7BMKhNsi+QlYTpG3UBm5V+eX7KIFpIAL6fElk0BHYjhQqjhCvxqDFs1nS 0XYJolN8sjzR+QnyFcLVAJgJqpSnNCXBFDPVVNbDZ5WKdknGtwzk0UrIWF3LMTIp EJ5IZIQYZRoEpc/Sj4RHOU7gfT+T1mtfD3e3etYT82PXFqW5aDR8Pcdb7QKmSlEB gWUg7nOPS7Hrv37Wf3B+5VhsKZ5O/ZjH5myx9ud9pUKBaeMlyzDjxlQXoW/AS4ld Lt0RnopJfOSS1ZcA8g2/eQwL80bUErIQEcGEvCzBPNHfthKu1Sqzhfx8gaWx0CGH ruY531JOgn4LktI16SV6iW5o6l/juw== =/jro -----END PGP SIGNATURE-----
--- End Message ---
