Nikolaus Rath writes ("Re: Bug#850005: dgit push without dgit build-source"): > $ dgit --dpm --clean=git build-source > Format `3.0 (quilt)', need to check/update patch stack > examining quilt state (multiple patches, dpm mode) > dgit: split brain (separate dgit view) may be needed (--quilt=dpm). > dgit: base trees orig=c8ab943f37df17d83f09 o+d/p=9e2aab849fc3a861ab5a > dgit: quilt differences: src: ## orig ## gitignores: == orig == > dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p > dgit: --quilt=dpm specified, implying patches-applied git tree > dgit: but git tree differs from result of applying debian/patches to upstream > > Adding -D gave a lot more output, but it didn't help me that much. > > Is there a way to see what differences dgit is concerned about? The > patches have been generated by git-dpm, so I believe they should match > exactly...
The complaint is that your HEAD is not equal to the result of applying the patches. dgit creates an "orig + patches" tree itself, to check this. The `o+d/p' hash is a tree object. I think something like git diff --stat 9e2aab849fc3a861ab5a..HEAD may be informative. Can you put your git branch, and any necessary origs, somewhere I can get at them ? Also feel free to spam me with the -D output, obviously. Thanks, Ian. -- Ian Jackson <ijack...@chiark.greenend.org.uk> 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.