Package: dgit-infrastructure
Version: 13.15
Hi.
Debian tag2upload service writes ("[tag2upload 1089] failed, nexus 4.4.3-8"):
> Format `3.0 (quilt)', need to check/update patch stack
> canonical suite name for unstable is sid
> dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
> examining quilt state (multiple patches, gbp mode)
> Unexpected differences between orig and HEAD:
> dgit (build host): base trees orig=e0d70b74fd0a55d0195d
> o+d/p=7faa8516ebc4bf702143
> dgit (build host): quilt differences: src: ## orig ## gitignores: ==
> orig ==
> dgit (build host): quilt differences: HEAD ## o+d/p HEAD
> == o+d/p
> bindings/idl/build_win.bat | 126 ++---
> bindings/java/compilejava.bat | 12 +-
> windows/applications/nxbrowse/nxbrowse.vcproj | 384 +++++++-------
> windows/applications/nxconvert/nxconvert.vcproj | 422 +++++++--------
> windows/applications/nxdir/nxdir.vcproj | 432 ++++++++--------
> windows/applications/nxingest/nxingest.vcproj | 486 +++++++++---------
> windows/applications/nxsummary/nxsummary.vcproj | 486 +++++++++---------
> .../applications/nxtranslate/nxtranslate.vcproj | 566
> ++++++++++-----------
> windows/applications/nxtraverse/nxtraverse.vcproj | 374 +++++++-------
> windows/bindings/cpp/nexusCPP.vcproj | 374 +++++++-------
> windows/nexus.sln | 218 ++++----
> windows/nexus/nexus.vcproj | 510 +++++++++----------
> 12 files changed, 2195 insertions(+), 2195 deletions(-)
I cloned this package and I see it has a .gitattributes which tries to
do line ending conversions.
The question of .gitattributes is discussed briefly here:
https://wiki.debian.org/tag2upload#Notes_and_advice
and more etensively here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079434#20
In this case I would recommend simply defusing the gitattributes and
making a new .orig.tar.gz (+ds1 maybe). The afflicted files are
probably not used by the Debian build. There are other options,
including representing the line ending changes in the Debian git
branch as part of our delta.
Thinking about possible improvements to the tag2upload system:
I don't think git-debpush could have done anything better here.
The tag2upload service could perhaps have printed a message about
.gitattributes. Normally dgit doesn't warn about that, unless the
gitattributes haave not been defused - because dgit thinks that its
users are expecting defused gitattributes (which is correct for eg an
NMU)
But the tag2upload service could have printed a warning, as part of
the discrepancy report. (--tag2upload-builder-mode could imply that.)
Also vaguely relevant is #1111548 "tag2upload service makes .origs
with un-defused gitattributes" but I don't think that was part of the
causal chain here, since the report contains:
> # using existing orig(s)
(But maybe the orig was made with git-deborig in which case that bug
would be one of the causes.)
Finally: Sean, I see that this report contains the instructions for a
local repro, instead the the previously-seen stack trace :-).
Regards,
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.
