Re: Moving off of git-dpm (Re: git-dpm breakage src:faker)
Brian May <bam@debian.org> writes:
> [brian:~/tree … modules/factory-boy] master 255 ± dgit --gbp --clean=git sbuild --verbose
> Format `3.0 (quilt)', need to check/update patch stack
> examining quilt state (multiple patches, gbp mode)
> dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
> dgit: base trees orig=3b9eaf2cb2a9245a1c10 o+d/p=6f1d04c157a8cd0a7eea
> dgit: quilt differences: src: ## orig ## gitignores: == orig ==
> dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p
> dgit: --quilt=gbp specified, implying patches-unapplied git tree
> dgit: but git tree differs from orig in upstream files.
>
> This error puzzles me, to me it seems to be saying there is a mismatch
> between git with patches unapplied and the *.orig.tar.gz file - however
> I don't think this is the case.
Ok, so there really was a difference: the git archive was missing the
"docs/_static/.keep_dir" file that is included in the upstream file.
Probably good that dgit detects discrepancies such as these, however not
so good that it took me sometime to work out the problem based on the
given message. If it told me what was different, it would be much be
helpful.
(also leads to the question why this file was missing from my import
last month - but I can't remember what I did now)
When I did build the package I can confirm that the generated source
package had multiple patch files (as expected).
--
Brian May <bam@debian.org>
Reply to: