Document multisuite

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index bdc13eac8a210bea1aa8bda060cd8b77f57d3966..32064c1eeb5b4e4a8a01c51b3138818cca8f03ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dgit (2.10~) unstable; urgency=medium
     the user on the local dgit branch, not on `master'.
   * Actually honour the branch name, if we are on dgit branch, to specify
     the suite, as documented in the manpage.
+  * New comma-separated multiple-suite merging facility (readonly),
+    so that users can easily track "jessie, or jessie-security".
 
  --
 

diff --git a/dgit-user.7.pod b/dgit-user.7.pod
index fc0d5905b2668c86bdbfdfb7ab7aeea2fc4f451f..d34160564c62c048e77f044901982b51c9e61f04 100644 (file)
--- a/dgit-user.7.pod
+++ b/dgit-user.7.pod
@@ -30,7 +30,7 @@ or L<dgit(1)> and L<dgit(7)>.
 
 =over 4
 
-    % dgit clone glibc jessie
+    % dgit clone glibc jessie,-security
     % cd glibc
     % wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u
     % git commit -a -m 'Fix libc lost output bug'

diff --git a/dgit.1 b/dgit.1
index 0d395ff5d374156d85b80dbdecb6cfb283203a2a..677a51be2eea2517aa6b9ada23ef8d55d408d62d 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -73,6 +73,22 @@ for the distro to which
 .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
@@ -90,6 +106,10 @@ then dgit fetch defaults to
 .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