test suite: tagupl: Test signature verification fail.

[dgit.git] / dgit.7

diff --git a/dgit.7 b/dgit.7
index d625e8fcbbc32c8a731867a8808e932d7143ff55..d1e5c7ea579309a047ac495e1cef8da3256fd80b 100644 (file)
--- a/dgit.7
+++ b/dgit.7
@@ -161,7 +161,7 @@ or to try to upload to it.
 
 When using this facility, it is important to always specify the
 same suites in the same order:
 
 When using this facility, it is important to always specify the
 same suites in the same order:

-dgit will not be make a coherent fast-forwarding history
+dgit will not make a coherent fast-forwarding history

 view otherwise.
 
 The history generated by this feature is not normally suitable
 view otherwise.
 
 The history generated by this feature is not normally suitable


@@ -361,7 +361,7 @@ whose tree is identical to o+d/p in all upstream files.
 In the error message,
 696c9bd5..84ae8f96
 is the first commit child-parent edge
 In the error message,
 696c9bd5..84ae8f96
 is the first commit child-parent edge

-which cannot be sensibly be
+which cannot 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,
 either ignored, or turned into a patch in debian/patches.
 In this example, this is because
 it itself changes files in debian/patches,


@@ -393,7 +393,7 @@ this problem can occur if you have provided
 Debian git tooling such as git-debrebase, git-dpm or git-buildpackage
 with upstream git commit(s) or tag(s)
 which are not 100% identical to your orig tarball(s).
 Debian git tooling such as git-debrebase, git-dpm or git-buildpackage
 with upstream git commit(s) or tag(s)
 which are not 100% identical to your orig tarball(s).

-.SH SPLIT VIEW QUILT MODE
+.SH SPLIT VIEW AND SPLITTING QUILT MODES

 When working with git branches intended
 for use with the `3.0 (quilt)' source format
 dgit can automatically convert a suitable
 When working with git branches intended
 for use with the `3.0 (quilt)' source format
 dgit can automatically convert a suitable


@@ -401,21 +401,33 @@ maintainer-provided git branch
 (in one of a variety of formats)
 into a dgit branch.
 
 (in one of a variety of formats)
 into a dgit branch.
 

-When a split view mode is engaged
+When a splitting quilt mode is selected

 dgit build commands and
 dgit push
 will, on each invocation,
 convert the user's HEAD into the dgit view,
 so that it can be built and/or uploaded.
 
 dgit build commands and
 dgit push
 will, on each invocation,
 convert the user's HEAD into the dgit view,
 so that it can be built and/or uploaded.
 

-dgit push in split view mode will push the dgit view to the dgit
+Split view mode can also be enabled explicitly
+with
+the --split-view command line option
+and
+the .split-view access configuration key.
+
+When split view is in operation,
+regardless of the quilt mode,
+any dgit-generated pseudomerges
+and any quilt fixup commits
+will appear only in the dgit view.
+dgit push
+will push the dgit view to the dgit

 git server.
 The dgit view is always a descendant of the maintainer view.
 dgit push will also make a maintainer view tag
 according to DEP-14
 and push that to the dgit git server.
 
 git server.
 The dgit view is always a descendant of the maintainer view.
 dgit push will also make a maintainer view tag
 according to DEP-14
 and push that to the dgit git server.
 

-Split view mode must be enabled explicitly
+Splitting quilt modes must be enabled explicitly

 (by the use of the applicable command line options,
 subcommands, or configuration).
 This is because it is not possible to reliably tell
 (by the use of the applicable command line options,
 subcommands, or configuration).
 This is because it is not possible to reliably tell