Your message dated Thu, 08 Nov 2018 02:42:44 +0000 with message-id <[email protected]> and subject line Bug#903377: fixed in dgit 8.1 has caused the Debian Bug report #903377, regarding convert-from-gbp: `diverged', --overwrite if no previous dgit push 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.) -- 903377: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903377 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: 8.1 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, 08 Nov 2018 02:09:05 +0000 Source: dgit Binary: dgit git-debrebase dgit-infrastructure Architecture: all source Version: 8.1 Distribution: unstable Urgency: medium Maintainer: Ian Jackson <[email protected]> Changed-By: Ian Jackson <[email protected]> Closes: 903377 905433 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 (8.1) unstable; urgency=medium . git-debrebase; * convert-from-unapplied: Provide aa an alias for convert-from-gbp and document its scope properly, etc. Closes:#905433. * dgit-maint-debrebase(7): discuss -fdiverged with convert-from-*, and (prompted) dgit --overwrite. Closes:#903377. [Sean Whitton] . i18n support: * Check pod translations for a common class of syntax error. (using new machinery for pairwise checking of pod translations.) * po4a: Add -LUTF-8 to the config. * po4a/.gitignore: actually ignore right .po4a.LANG.cfg. . test suite: * Run everything with LC_CTYPE=C.UTF-8. * manpages-format: pass --warnings. * NOTES.podchecker: Document why we're not using podchecker. Checksums-Sha1: 5061f0979251a07cffb368d0868833405a4b7781 1665 dgit_8.1.dsc 4d17b389eee37a7cac29482958d38a139ad9b43b 629461 dgit_8.1.tar.gz c766190fd7619ccaef4af8c9e3ba3a62e4d1f30e 63028 dgit-infrastructure_8.1_all.deb 0cac2688678ca4972ac666eeee6749f03ae86868 177064 dgit_8.1_all.deb f6f39ebd8d6eb7f08187fe631bba0ec135396ca8 5939 dgit_8.1_amd64.buildinfo 48a76a2dbc6affa660c4a5d5eb9350e1b71c6747 86736 git-debrebase_8.1_all.deb Checksums-Sha256: c790b00dbb3772dc18aba74d26b4199229d2501f1dfbad649ac418887ade5add 1665 dgit_8.1.dsc 0245aa1b4b53da63fd958ef1687111294468fad70ea53754f925f24a3b2819c0 629461 dgit_8.1.tar.gz dda7bbd3a721fa9e5021e066caeacf15cdd254d3c2e4a28322d4d5868147cadf 63028 dgit-infrastructure_8.1_all.deb 51e95c5d5bfe42576c3901db4e9bc5fb57900f1bc315835a8d42491d3a18f711 177064 dgit_8.1_all.deb 893b57414d4874edb4447c217a480b00469a37eb0ed7db37d312eb97752b5160 5939 dgit_8.1_amd64.buildinfo 82fdb55b8f7bef9943b16451971968d64d1b582ffc9fbe562261d7a83c4b333e 86736 git-debrebase_8.1_all.deb Files: dc4fe48227b8cdbe9fbab21d0c0dec80 1665 devel optional dgit_8.1.dsc f6e235a987402eb452f34f086eb38a75 629461 devel optional dgit_8.1.tar.gz ce805b74c6405041ef0842f197ee3136 63028 devel extra dgit-infrastructure_8.1_all.deb b83c5781a3fef078380240baa4cfbda7 177064 devel optional dgit_8.1_all.deb c63ba365dbd630e4695bf6b1b25191c5 5939 devel optional dgit_8.1_amd64.buildinfo 44be37828ca8cae8dc60bd18cbd760a4 86736 devel optional git-debrebase_8.1_all.deb -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAlvjm2AACgkQ4+M5I0i1 DTkN0ggArcRcQHBatN9dWaVVBX7WhGqlEFIcFmrXzDzLRvRwtQIlMZpGgUKG6skW MtoKOH+Vsz/fo9hYnfxNQQV9tsTjH2VyYnsaRgeSEWyW99bdSff8TlUdCD0IBaiV Soiprje6lrlKue2cNqWViUILd3/SzyK+ASEv3tGfW0HhAIeqY7YbPn8nIb18W/I8 rJqqXvZ7Ms/V4ZwTCgVivis5BAvxQ7uAQq6C4KH56LYvl+A+kOVoRLJa6sfgdezI 9giw4AlJW57CyQQ/rTmz29VVMT8GxJze2JDAPhoKo5DNXUdKazKoz3VOZGaV5ICX Covr/s/SxtvSLSo3saRZ68vEllxGYA== =JxCp -----END PGP SIGNATURE-----
--- End Message ---
