|author||Ian Jackson <email@example.com>||2018-06-27 13:29:04 +0100|
|committer||Ian Jackson <firstname.lastname@example.org>||2018-06-27 13:31:05 +0100|
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 <email@example.com>
Diffstat (limited to 'dgit.7')
1 files changed, 84 insertions, 0 deletions
@@ -284,6 +284,13 @@ pushing. The only thing you need to know is that dgit build, sbuild,
etc., may make new commits on your HEAD. If you're not a quilt user
this commit won't contain any changes to files you care about.
+Simply commiting to source files
+(whether in debian/ or not, but not to patches)
+will result in a branch that dgit quilt-fixup can linearise.
+Other kinds of changes,
+including editing patches or merging,
+cannot be handled this way.
You can explicitly request that dgit do just this fixup, by running
@@ -292,6 +299,83 @@ If you are a quilt user you need to know that dgit's git trees are
directory (which is used by quilt to record which patches are
applied). If you want to manipulate the patch stack you probably want
to be looking at tools like git-dpm.
+.SS quilt fixup error messages
+When dgit's quilt fixup fails, it prints messages like this:
+dgit: base trees orig=5531f03d8456b702eab6 o+d/p=135338e9cc253cc85f84
+dgit: quilt differences: src: == orig ## gitignores: == orig ##
+dgit: quilt differences: HEAD ## o+d/p HEAD ## o+d/p
+starting quiltify (multiple patches, linear mode)
+dgit: error: quilt fixup cannot be linear. Stopped at:
+dgit: 696c9bd5..84ae8f96: changed debian/patches/test-gitignore
+is an import of the .orig tarballs dgit found,
+with the debian/ directory from your HEAD substituted.
+This is a git tree object, not a commit:
+you can pass its hash to git-diff but not git-log.
+is another tree object,
+which is the same as orig
+but with the patches from debian/patches applied.
+is of course your own git HEAD.
+.B quilt differences
+shows whether each of the these trees differs from the others
+(i) in upstream files excluding .gitignore files;
+(ii) in upstream .gitignore files.
+dgit quilt-fixup --quilt=linear walks commits
+backwards from your HEAD
+trying to construct a linear set of additional patches,
+starting at the end.
+It hopes to eventually find an ancestor
+whose tree is identical to o+d/p in all upstream files.
+In the error message,
+is the first commit child-parent edge
+which cannot be sensibly be
+either ignored, or turned into a patch in debian/patches.
+In this example, this is because
+it itself changes files in debian/patches,
+indicating that something unusual is going on
+and that continuing is not safe.
+But you might also see other kinds of troublesome commit or edge.
+Your appropriate response depends on the cause and the context.
+If you have been freely merging your git branch
+and do not need need a pretty linear patch queue,
+you can use
+(or use the
+source formats; see
+.BR dpkg-source(1) .)
+If you want a pretty linear series,
+and this message is unexpected,
+it can mean that you have unwittingly committed changes
+that are not representable by dpkg-source (such as some mode changes).
+Or maybe you just forgot a necessary
.SH SPLIT VIEW QUILT MODE
When working with git branches intended
for use with the `3.0 (quilt)' source format