From 57c7a33b3b21cd1840e33be2f159c4b7cd5ccf39 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 7 Nov 2016 02:41:44 +0000 Subject: [PATCH 1/1] Document multisuite Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ dgit-user.7.pod | 2 +- dgit.1 | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bdc13eac..32064c1e 100644 --- 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 fc0d5905..d3416056 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -30,7 +30,7 @@ or L and L. =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 0d395ff5..677a51be 100644 --- 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 -- 2.30.2