On Wed, Jun 21, 2017 at 10:05 AM, Ian Jackson
<ijack...@chiark.greenend.org.uk> wrote:
> Ian Jackson writes ("dgit: want improved quilt failure messages"):
>> Control: clone -1 -2
>> Control: retitle -2 want improved quilt failure messages
>> Control: severity -2 normal
> ...
>> Felipe complains that these messages are not very easy to understand.
>> Indeed things are complicated.
>>
>> Would it be helpful to provide a git diff rune in the output ?
>> Eg
>>
>> | dgit: --quilt=gbp specified, implying patches-unapplied git tree
>> | dgit: but git tree differs from orig in upstream files.
>> + | dgit: This command shows the troublesome differences:
>> + | dgit: git-diff d510ca798480f37fc567 -- . ':!.gitignore' ':!debian'
I quote here the full original message:
| 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.
I think dgit should:
1. Remove the first two lines. They are very confusing for the
uninitiated. I still don't grok what they mean.
2. Add the output of `git diff --name-only d510ca798480f37fc567 -- .
':!.gitignore' ':!debian'` , so that the offending files are known,
but the output is not too large.
3. Add the two lines you suggested, to make it easy to investigate the
differences.
Mutatis mutandis when there are differences with the second tree dgit builds.
--
Saludos,
Felipe Sateler
