Your message dated Wed, 08 Sep 2021 00:49:25 +0000
with message-id <[email protected]>
and subject line Bug#977426: fixed in dgit 9.14
has caused the Debian Bug report #977426,
regarding git-debrebase: complains about undocumented snag: -fanchor-treated
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.)
--
977426: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977426
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-debrebase
Version: 9.12
Severity: normal
The issue is that when I try to update tyo a new release I get this complaint:
$ git debrebase new-upstream 20.05
git-debrebase: snag detected (-fanchor-treated): old anchor is recognised due
to --anchor, cannot check upstream
I don't understand what it is complaining about and whilst -fanchor is
described in man 1 git-debrebase -fanchor-treated is not. So
documenting this would be good. If you explain it to me I could try
and document it myself and supply a patch.
The situation is this:
I prepared a package (armnn 19.11) using dgit and the dgit-maint-debrebase
process.
https://browse.dgit.debian.org/armnn.git/log/ a while ago.
I copied it to salsa, where my collaborator Francis added some more
patches to both upstream and debian/ dir (He also did a load of
psuedomerging which I _think_ included operations not permitted in a
git debrebasing repo - it was certainly messy).
https://salsa.debian.org/deeplearning-team/armnn
The task is now to update to 20.05 release (from
https://github.com/ARM-software/armnn)
If I just "dgit clone armnn", make sure it knows about upstream and
"git debrebase new-upstream 20.08" I get the above issue. I also get
the same complaint if I take my existing repo, cherry-pick the good
patches out of the above salsa mess, and then try to git debrebase
new-upstream 20.08
git-debrebase thinks the anchor is the initial "Add debian dir with
initial packaging" which seems correct.
Adding -fanchor-treated makes the rebase proceed as expected, but I'd
like to understand why that is needed rather than blindly adding it.
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 9.14
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: SHA256
Format: 1.8
Date: Wed, 08 Sep 2021 01:30:53 +0100
Source: dgit
Architecture: source
Version: 9.14
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 930930 940589 949675 972098 973881 975624 977426
Changes:
dgit (9.14) unstable; urgency=medium
.
Bugfixes:
* Tolerate git config init.defaultBranch. Closes:#972098.
Reports from Didier 'OdyX' Raboud, Osamu Aoki.
Diagnosis by Stig Sandbeck Mathisen.
* dgit: Tolerate making quilt patches creating +x files.
Closes:#949675. Report from peter green.
* dgit: Avoid use of GZIP environment variable.
Closes: #975624. Report from Stéphane Glondu.
* Tolerate git config diff.noprefix.
Closes:#973881; report from Didier 'OdyX' Raboud.
.
Documentation and diagnostics:
* Clarify git-debrabase --anchor, -fanchor-treated.
Closes:#977426. Report from Wookey <[email protected]>.
* dgit: Better message for dirty trees. Closes:#930930.
Report and suggestions from Sean Whitton.
.
git-debpush, tag2upload:
* Add missing dependency. Closes:#940589; report from Andrej Shadura.
* Fix version unmangling. loses:#987304; report from Wolfgang Silbermayr.
.
Tests:
* Introduce t-debchange and set DEBEMAIL.
* Add init.defaultBranch to two test cases and diff.noprefix to one.
* Test creation of new symlink is treated as unrepresentable.
* Increase the nproc -> make -j factor.
Checksums-Sha1:
888c658bb6261e4cb65993a513a811972ece80a7 1846 dgit_9.14.dsc
1a5918adfd3d0d93441f93348eb2b2a0a2737c9f 696228 dgit_9.14.tar.gz
Checksums-Sha256:
e1843304af535eea7c1ff0760174860d3d238c5f31b169b5ef7b3ef908576830 1846
dgit_9.14.dsc
ba558b815a1459686e5ecd2f7484a06c7470b749c78a1109fdf7cd7aef1fc632 696228
dgit_9.14.tar.gz
Files:
c3bb07b48bc4b34a712a3cf71b66e778 1846 devel optional dgit_9.14.dsc
02676c94f797c1d0606789e530c4bee0 696228 devel optional dgit_9.14.tar.gz
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmE4BIwACgkQ4+M5I0i1
DTlWYQgAtLmFrfMSOuAmYsKYtdRbnRCGnZJk5nHEDxtICnmE+gL4Ato4WtYdNcvS
TmwEkR7qvRlXzlNeAvmvEminXH+GomwOzkMA1YVKBOAql7Yjy1gB0n/08PkEQJps
Tx2/OHx57cwBNhRP6ILBp+aK0wcY+OOZhBVTRVFy0J4Q++Iw4HYcWQuEsaybsX72
IZrd0VaxJcPJpqTlZTbjFHlyuAWKICqtjVX6cNK6Zg9FsAL0v3lHl6jiEOs+0btJ
jem16LDgNu8uHIYnmX17QIOVe5ut27A8DL3+p5bhcrnTaREuVSXP1t/wJQDUZsO0
tBEzg4JgIAYXAhWAwQWcMlT41zJv9A==
=A952
-----END PGP SIGNATURE-----
--- End Message ---