Your message dated Sat, 29 Mar 2025 21:51:06 +0000
with message-id <[email protected]>
and subject line Bug#1099519: fixed in dgit 12.10
has caused the Debian Bug report #1099519,
regarding /usr/bin/dgit: dgit-nmu-simple should be less pessimistic about
rebasing
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.)
--
1099519: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1099519
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 12.6
Severity: normal
File: /usr/bin/dgit
I was asked in pers.comm about rebasing a branch from dgit clone, as
part of the dgit-nmu-simple workflow.
Our current comments about rebasing are a bit elliptical; dealing
simultaneously with detailed situtations, but also doing so vaguely.
I think we ought to state more directly the basic principles.
Something like this:
You can treat the dgit/sid branch you end up on as a normal local
git branch tracking an upstream branch. So you can rebase your local
changes that you haven't pushed anywhere, as normal.
The one thing that's weird is the quilt fixup commits (that turn up
if you do eg dgit sbuild), and the thing you need to know is that if
it's OK for you to be rebasing them at all, you can and should just
dreop them.
All of this follows from an underlying fact, which is that dgit
doesn't have any magic state somewhere. So if you rebase away the
quilt fixup, and rework your branch, the result must be fine because
it looks *just like* it would do if you'd just made those commits
straight off. (NB git-debrebase *does* have weird off-branch state.)
Ian.
-- System Information:
Debian Release: trixie/sid
APT prefers testing-debug
APT policy: (500, 'testing-debug'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 6.12.11-amd64 (SMP w/16 CPU threads; PREEMPT)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: sysvinit (via /sbin/init)
LSM: AppArmor: enabled
Versions of packages dgit depends on:
ii apt 2.9.26
ii ca-certificates 20241223
ii coreutils 9.5-1+b1
ii curl 8.11.1-1+b1
ii devscripts 2.25.1
ii dpkg-dev 1.22.14
ii dput-ng [dput] 1.40
ii git [git-core] 1:2.47.2-0.1
ii git-buildpackage 0.9.37
ii libdpkg-perl 1.22.14
ii libjson-perl 4.10000-1
ii liblist-moreutils-perl 0.430-2
ii liblocale-gettext-perl 1.07-7+b1
ii libtext-csv-perl 2.05-1
ii libtext-glob-perl 0.11-3
ii libtext-iconv-perl 1.7-8+b4
ii libwww-curl-perl 4.17-11
ii perl [libdigest-sha-perl] 5.40.0-8
ii python3 3.13.1-2
Versions of packages dgit recommends:
ii distro-info-data 0.63
ii liburi-perl 5.30-1
ii openssh-client [ssh-client] 1:9.9p1-3
Versions of packages dgit suggests:
ii cowbuilder 0.90
ii pbuilder 0.231.1
ii sbuild 0.88.2
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 12.10
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: SHA512
Format: 1.8
Date: Sat, 29 Mar 2025 18:04:29 +0000
Source: dgit
Architecture: source
Version: 12.10
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 1076983 1090762 1090763 1092929 1099311 1099519
Changes:
dgit (12.10) unstable; urgency=medium
.
dgit:
* Avoid crash with EEXIST on single-debian-patch and --split-view=always.
Closes: #1076983. [Report from Aaron M. Ucko]
* Better tolerate source trees without debian/rules, eg with debputy.
Closes: #1092929. [Niels Thykier; report from Andrea Pappacoda]
.
git-debrebase:
* Unconditionally enable general merge resolution attempts;
improve relevant documentation, and invite bug reports.
(Previously this required --experimental-merge-resolution).
* upstream: Strip epoch in human-facing outputs. Closes: #1099311.
.
workflow manpages:
* dgit-maint-bpo(7): Replace a lingering --overwrite. [Sean Whitton]
* dgit-nmu-simple(7): Be less pessimistic about rebasing. Closes: #1099519.
* Disambiguate what we mean by "first ever dgit push". [Sean Whitton]
.
translations [Frans Spiesschaert]:
* nl: Update translation for messages. Closes: #1090762.
* nl: Update translation for dgit-user(7). Closes: #1090763.
.
Infrastructure:
* Improve handling of stderr output from gpgv.
(Improves the output for users of dgit push, and tag2upload emails.)
.
tag2upload:
* Builder: Use dgit and gdr from testing. [Sean Whitton]
* dgit-repos access control): Expect a separate tag2upload public keyring.
* Oracle: Pass -u to dput to suppress a spurious warning in email reports.
* Oracle: Speak oracle-to-manager protocol version 4.
* Oracle: Report fidelity to Manager (whether we're the production codebase).
* Oracle/Builder: Always report source package (using info from Manager).
* Oracle: Improved consistency and informativeness of logging.
* tests: t2u: Add a test case for a completely unknown signing key.
Checksums-Sha1:
b290440811f29de8af55775a4ece7298ddad43c3 1898 dgit_12.10.dsc
60bff19d0bdf967453c758237f62c9ce10e9c4d2 753330 dgit_12.10.tar.gz
Checksums-Sha256:
73c14f61182faa06b800f860a78a40efe307a881f8d53fb7f87dda2d32725e2a 1898
dgit_12.10.dsc
a833518a1b7ea02fc861969e530a8412c7f737d848dff57ba97fa44a9031c692 753330
dgit_12.10.tar.gz
Files:
b9ef032112eb10363d8face9396d9b5c 1898 devel optional dgit_12.10.dsc
08ea681b47b0088cc5dc398318fdb6d8 753330 devel optional dgit_12.10.tar.gz
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmfoS/sACgkQ4+M5I0i1
DTmNFgf/ZeijLzE+aylazupsLHWsXEpFJyAN/VhDriXJiW3AqQpCaz3clHNKDfK9
gQsAy75aVE/7zmZqtQeG+grBdXJR46nipYUI8F9HUx6z4gm8zt+OYXwreSU5lbML
ML3NSierMSMrcBE6E/53PzXz9UZNAgYKiG7WWKOfj2hIC56b60R85rySoSe0XYZ4
JTLMsB0yJKpNNHuTkm0bq+yBptggusIqQ57elkyFkfQaXv8D/fNuo4QwMBnbOruA
4RtVr9rUcT91ocmmMq7x4Cc9pziySkYiA6jNweLEGTs/xGPn03fNMg0bzA0y2lBh
n7H4t7fVJtaklTceeQBJhlXtgbXf8Q==
=p5LF
-----END PGP SIGNATURE-----
pgpkDU60ReFZu.pgp
Description: PGP signature
--- End Message ---
