Package: git-debrebase
Version: 10.7+deb12u3
Severity: wishlist
Hi Ian et al,
As mentioned in person at DC25, when debrebase does it's work, it ends up
producing something like this:
66c99d788 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest)
Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
...
8ca221800 Debian-ify fetchneedles
7d4f97dd7 Debian uses apt to list packages
7048d83ec Debian specific apparmor changes
8c23b761b Debian tweaks for apache config
4d26808b0 changelog: releasing 5.1751519172.720c194b1-1~fto12+1
4de3fdaa0 Build-depend: python3-argparse-manpage
e5106d696 use local Roboto copy (embeded copy)
5769109c4 Update changelog for new upstream 5.1751519172.720c194b1
721e9591c Update to upstream 5.1751519172.720c194b1
where the tag goes on the merge, but the "releasing" commit is on the other side
of all the patches to upstream.
I would prefer it if that ended up like this:
66c99d788 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest)
Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
4d26808b0 changelog: releasing 5.1751519172.720c194b1-1~fto12+1
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
...
or perhaps even:
4d26808b0 (tag: debian/5.1751519172.720c194b1-1_fto12+1, salsa/debian/latest)
changelog: releasing 5.1751519172.720c194b1-1~fto12+1
66c99d788 Merge remote-tracking branch 'salsa/debian/latest' into debian/latest
23a575c6a Commit patch queue (exported by git-debrebase)
d18e07ea9 avoid broken sorting caused by 'serverSide: true'
765ff870a apparmor: add Debian path for tesseract data
...
so that the releasing changelog change is close-to or on the thing that says
it's making the release. and the commits that modify the upstream don't end up
looking a bit like they were applied after the release version, when one looks
at
the git log (without paying attention to the tag).
Cheers, Phil.
-- System Information:
Debian Release: 12.11
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500,
'stable'), (100, 'bookworm-fasttrack'), (99, 'unstable'), (90, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 6.1.0-37-amd64 (SMP w/4 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages git-debrebase depends on:
ii devscripts 2.23.4+deb12u2
ii git [git-core] 1:2.39.5-0+deb12u2
ii libdpkg-perl 1.21.22
ii libfile-fnmatch-perl 0.02-3+b1
ii liblocale-gettext-perl 1.07-5
ii perl 5.36.0-7+deb12u2
Versions of packages git-debrebase recommends:
ii dgit 10.7+deb12u3
ii git-buildpackage 0.9.30
git-debrebase suggests no packages.
-- no debconf information
