Package: dgit
Version: 6.6
If your .orig.tar.gz does not match the upstream commitish you passed
to gdr:
- gdr does not notice (because it does not look at origs at all)
- dgit will call gdr to make patches, which will succeed
- dgit quilt-fixup will then observe that the tree is not the
same as orig + patches; it will walk backwards to find the
place to start linearising
- dgit will stop at the gdr-generated patches commit
The error looks something like this:
$ dgit -wgf quilt-fixup
Format `3.0 (quilt)', need to check/update patch stack
examining quilt state (multiple patches, linear mode)
dgit: base trees orig=e21bf8a0df76aa07b4ac o+d/p=b57be302abd3b173c545
dgit: quilt differences: src: ## orig ## gitignores: ## orig ##
dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p
starting quiltify (multiple patches, linear mode)
dgit: error: quilt fixup cannot be linear. Stopped at:
dgit: 90fcb93f..522f2f39: changed debian/patches/0001-[... complete list of
patches appears here ...]
dgit: Maybe you need to specify one of --[quilt=]gbp --[quilt=]dpm
--quilt=unapplied ?
dgit: error: quilt history linearisation failed. Search `quilt fixup' in
dgit(7).
dgit: Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch
The commit identified as troublesome is from gdr make-patches.
In this situation, dgit can know that --quilt-* is not wanted. I
think the only likely cause is a bad orig (see #906196). These other
things should not be suggested.
FTR I have a repro for this but it is currently in an embargoed git
branch. 522f2f393509f22188945108d776b7a9abbd9e30 exhibits the problem
if export-subst is not disabled when making the origs from
d95b5bb31e6d4361e356f0ff0853b6bb172a8b6a and
13e85a6dbc1eeda4f95c0d3afcd205579eab5909.
Ian.
--
Ian Jackson <[email protected]> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
