diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-27 13:29:04 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-27 13:31:05 +0100 |
| commit | 0c285f61c99f278e9cf6b121037bbce8f9d0e3b9 (patch) | |
| tree | 9b2704c70fbb49b3837f53420a46c850109e1835 /dgit | |
| parent | 05babd80e5414230f567ac26bf3d5118aa595320 (diff) | |
dgit(7): Add discussion of quilt fixup error messages
And add cross-references to dgit(1) and the actual error.
Somewhat apropos of #842614.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -5400,7 +5400,8 @@ sub quiltify ($$$$) { print STDERR "$us: ", $reportnot->($notp), "\n"; } print STDERR "$us: $_\n" foreach @$failsuggestion; - fail "quilt fixup naive history linearisation failed.\n". + fail + "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n". "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch"; } elsif ($quilt_mode eq 'smash') { } elsif ($quilt_mode eq 'auto') { |