Better error message for inappropriate multi-suite

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 9878c20e258492d247a749ede48473d0ab1013f9..677a51be2eea2517aa6b9ada23ef8d55d408d62d 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -73,6 +73,22 @@ for the distro to which
 .I suite
 belongs.
 
 .I suite
 belongs.
 

+.I suite
+may be
+.IR mainsuite \fB,\fR subsuite ...
+in which case dgit will synthesize a view giving the most
+recent version in any of the specified suites.
+(The subsuites do not need to have the package.)
+If a subsuite starts with
+.B -
+then mainsuite is prepended.
+Each of the suite names will be individually canonicalised
+to calculate the canonical branch names to use.
+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
+view otherwise.
+

 For your convenience, the
 .B vcs-git
 remote will be set up from the package's Vcs-Git field, if there is
 For your convenience, the
 .B vcs-git
 remote will be set up from the package's Vcs-Git field, if there is


@@ -90,6 +106,10 @@ then dgit fetch defaults to
 .IR suite ;
 otherwise it parses debian/changelog and uses the suite specified
 there.
 .IR suite ;
 otherwise it parses debian/changelog and uses the suite specified
 there.

+
+suite may be
+.IR mainsuite \fB,\fR subsuite ...
+as for clone.

 .TP
 \fBdgit pull\fR [\fIsuite\fP]
 Does dgit fetch, and then merges the new head of the remote tracking
 .TP
 \fBdgit pull\fR [\fIsuite\fP]
 Does dgit fetch, and then merges the new head of the remote tracking


@@ -710,6 +730,8 @@ Specifies a single additional option to pass to
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,
 .BR sbuild ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR gbp-pq ,
 .BR gbp-build ,
 or
 .BR gbp-pq ,
 .BR gbp-build ,
 or


@@ -755,6 +777,8 @@ Specifies alternative programs to use instead of
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,

+.BR apt-get ,
+.BR apt-cache ,

 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,
 .BR git ,
 .BR gbp-pq ,
 .BR gbp-build ,


@@ -879,6 +903,9 @@ Settings likely to be useful for an end user include:
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.
 Specifies the distro for a suite.  dgit keys off the suite name (which
 appears in changelogs etc.), and uses that to determine the distro
 which is involved.  The config used is thereafter that for the distro.

+
+.I suite
+may be a glob pattern.

 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.