Control: clone -1 -2
Control: retitle -2 want improved quilt failure messages
Control: severity -2 normal
Ian Jackson writes ("Re: Bug#842614: Bug#842608: dgit pull should bail out in
splitbrain mode"):
Ian Jackson writes ("Re: Bug#842614: Bug#842608: dgit pull should bail out in
splitbrain mode"):
> | dgit: --quilt=gbp specified, implying patches-unapplied git tree
> | dgit: but git tree differs from orig in upstream files.
>
> --quilt=gbp expects to be given a gbp interchange branch, which (as
> far as upstream files goes) is patches-unapplied except that it might
> contain uncommitted .gitignore changes.
>
> However, your HEAD differs from your .orig in other ways.
>
> git-diff HEAD d510ca798480f37fc567 will show you the differences from
> the upstream tarball.
>
> git-diff HEAD 5c8951c97cef58952a93 will show you the differences from
> upstream + your debian/. That should be empty apart from .gitignore.
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'
Ian.
