Your message dated Mon, 03 Feb 2020 09:19:27 +0000
with message-id <[email protected]>
and subject line Bug#928473: fixed in dgit 9.10
has caused the Debian Bug report #928473,
regarding dgit: not clear what to do when earlier uploads used dgit but
intermediate ones didn't
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.)
--
928473: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928473
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: dgit
Version: 8.4
Severity: normal
I tried to upload the current state of
https://salsa.debian.org/pkg-debconf/debconf using dgit (commit
48c5ce38cfd5d4679ddb2d7c60d7f85833b4a501 with an extra "dch -r &&
debcommit -r" on the end). I got the following output:
$ dgit -L push-source
DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES
canonical suite name for unstable is sid
dpkg-source: info: using source format '3.0 (native)'
dpkg-source: info: building debconf in debconf_1.5.72.tar.xz
dpkg-source: info: building debconf in debconf_1.5.72.dsc
changelog will contain changes since 1.5.71
dpkg-genchanges: info: including full source code in upload
downloading
http://ftp.debian.org/debian//pool/main/d/debconf/debconf_1.5.71.dsc...
last upload to archive: NO git hash
using existing debconf_1.5.71.tar.xz
dpkg-source: info: extracting debconf in debconf-1.5.71
dpkg-source: info: unpacking debconf_1.5.71.tar.xz
synthesised git commit from .dsc 1.5.71
dgit: error: dgit push: HEAD is not a descendant of the archive's version.
dgit: To overwrite the archive's contents, pass --overwrite[=VERSION].
dgit: To rewind history, if permitted by the archive, use
--deliberately-not-fast-forward.
! Push failed, while preparing your push.
! You can retry the push, after fixing the problem, if you like.
debconf had previously been uploaded using dgit, back at version 1.5.53.
The current HEAD of https://browse.dgit.debian.org/debconf.git/ is
c5cd2f6ae316f9f928ad094a9dcdd8a7f020d8b2, which is a direct ancestor of
my current master branch tip.
I therefore went and read the documentation for these options to try to
understand what I should do.
--overwrite looks sort of right, but it gives the example of having
incorporated NMU changes which isn't my situation, nor is it true that
this is the first time the package has been pushed using "dgit push" to
the suite in question. And it tells me that it's going to make a
pseudo-merge, which doesn't seem like what I want because the version in
the archive already has an exact representation in my branch: I have a
dgit/dgit/sid ref here whose tree is identical to my 1.5.71 tag,
although the history is synthetic.
--deliberately-not-fast-forward seems only dubiously appropriate,
because I'm not rewinding history. The version in the archive is
1.5.71, which is a direct ancestor of what I'm trying to upload and has
an exact representation in my branch's history. HEAD of
https://browse.dgit.debian.org/debconf.git/ is also a direct ancestor of
what I'm trying to upload. Does it actually mean that my branch isn't
fast-forwarding from the synthetic representation of 1.5.71 that dgit
constructed, because 1.5.71 wasn't uploaded using dgit?
Ideally I'd like dgit to notice that the history of my branch in fact
has everything it needs (as in, there's a commit there that has a tree
identical to what's currently in the archive) even though the uploads
between 1.5.53 and now weren't made using dgit. But maybe I
misunderstand something? Is it OK for me to use
--deliberately-not-fast-forward in this situation, which seems ideal
from my point of view? If so it would perhaps be helpful for the
documentation to say a bit more about this situation, because it seems
that it must be somewhat common for some maintainers of a package to use
dgit and some not, and this is exactly the kind of situation that arises
from that.
Thanks,
--
Colin Watson [[email protected]]
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 9.10
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: Mon, 03 Feb 2020 08:41:10 +0000
Source: dgit
Binary: dgit git-debrebase git-debpush dgit-infrastructure
Architecture: source
Version: 9.10
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Description:
dgit - git interoperability with the Debian archive
dgit-infrastructure - dgit server backend infrastructure
git-debpush - client script for git pushing to Debian-style archives
git-debrebase - rebasing git workflow tool for Debian packaging
Closes: 928473 932954 940588 945356 950326
Changes:
dgit (9.10) unstable; urgency=medium
.
dgit bugfix:
* Work around gbp metadata handling bug which can prevent import
of some anomalous source packages. Closes:#950326.
Report from Peter Green.
.
git-debpush bugfix:
* avoid a pipefail problem. Closes:#940588. [Sean Whitton]
.
Documentation:
* Terminology: Change "rewind" to "rewrite" where appropriate
* dgit(1): Cover more cases of --overwrite and --deliberately
Closes:#928473.
* dgit(1): Do not talk about `intermediate' uploads.
* d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in
gbp.conf; set `merge' in gbp.conf; import tarball before
committing gbp.conf. Closes:#932954. [Sean Whitton]
.
i18n:
* Updated nl.po file. Closes:#945356. [Frans Spiesschaert]
Checksums-Sha1:
1fbc371ffb8f7ccbf4ba2426a88ca6dc1fbef17e 1846 dgit_9.10.dsc
12c3986794e5eb4a57694d796fe625b8a040f7ea 696437 dgit_9.10.tar.gz
Checksums-Sha256:
17803a016ecda8a597ca9404625b2e1f8ca638809f2bd99b2b0260c654c4ce76 1846
dgit_9.10.dsc
d835ad0ff380ba53773904febda742cf4c9506403d6eaaab8ec68952febdfbe3 696437
dgit_9.10.tar.gz
Files:
dfed9ca7934342f0e748ad0e472cb1d3 1846 devel optional dgit_9.10.dsc
912e8fd688da57be3fc1c9139ef5c1d9 696437 devel optional dgit_9.10.tar.gz
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAl433mQACgkQ4+M5I0i1
DTnuLwgAsV/c84xDQc9UYl+LhhAM6LY0tKHL05AtrOpe/VqDWHgAXn06afPh8R0e
D8QCKg4vyyf/dSX5zjnZZgGcySYkhXDEm+SIFMWkIbcYZG4oQSrOob8EP58fEkKT
rbcJs5yMw3EqkOnuz+NWtZBosj0nr29PQPwjETnA2SabpmCw/+0E489wvLrFeXBV
U5CUhpIcS8zmcHUnxjEBxGt5sx85eR3QOv4nSR1y3bv0E5GOz9F3dy/O2HHD0psG
WcovQyXpSAzBvbmd8TIa2q9maO7ldRA1mq5z3ha2V7Kf91XluJ1otVnKhHpplPLu
hbmBIBvKFr+22IL/afFDHKSO8tJdsg==
=9eXd
-----END PGP SIGNATURE-----
--- End Message ---
