Sean Whitton writes ("Bug#834618: dgit quilt-fixup shouldn't ever fail if there are no local changes to record"): > Package: dgit > Version: 1.4 > Severity: normal > > For example: > > hephaestus ~/src/ocrmypdf % dgit quilt-fixup > Format `3.0 (quilt)', checking/updating patch stack > starting quiltify (multiple patches, linear mode) > HEAD is now at ddd62dc release > dgit: quilt fixup cannot be linear. Stopped at: > dgit: 293e3b0e..4dabc96d: changed > debian/patches/0001-patch-test-suite-executable.patch > dgit: quilt fixup naive history linearisation failed. > dgit: Use dpkg-source --commit by hand; or, --quilt=smash for one ugly > patch
If there are no changes then it shouldn't fail. But it may be that there is some other problem and the bug is a wrong error message. Can you please send me all the ingredients ? I will need: * All the .orig's involved * The git HEAD you were working from Thanks, Ian.