From b6c8337a04e09e6c269cfb47ccf6770e901f0307 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 12 May 2024 14:51:33 -0500 Subject: [PATCH] debian/README.source: add rationale --- debian/README.source | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/debian/README.source b/debian/README.source index 8efb41222b1..728f4628bbf 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,5 +1,22 @@ -We use git-dpm, gbp-dch and dgit in combination. -We expect to replace git-dpm with git-debrebase at some point. +We use git-dpm, gbp-dch and dgit in combination. We expect to replace +git-dpm with git-debrebase at some point. + +Rationale +========= + +The revision control arrangment (branching, etc.) has had to +accommodate both source-level package versioning (i.e. emacs25, +emacs26, ...) and splitting the upstream code into two source packages +for each release (i.e. emacs and emacs-non-dfsg), but the emacs +packages have been unversioned, so the former doesn't apply right now. +In any case, that's why all the refs include the source package name. + +The refs are prefixed with deb/ to support packaging work in a +repository that might also be used for normal upstream development +(say you're in both roles) so conflicts will be unlikely. + +Finally, the refs include the release name to ease/normalize work +across releases, backports, etc. Worktrees ========= @@ -151,4 +168,4 @@ The repository layout, DFSG splitting and this workflow were developed mostly by Rob Browning. Sean Whitton updated the workflow in a few respects, adding the use of worktrees, and prepared and published this documentation. - -- Sean Whitton , Sat, 27 Apr 2024 14:11:39 +0100 + -- Rob Browning , Wed, 15 May 2024 00:45:46 -0500 -- 2.30.2