-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
=========
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 <spwhitton@spwhitton.name>, Sat, 27 Apr 2024 14:11:39 +0100
+ -- Rob Browning <rlb@defaultvalue.org>, Wed, 15 May 2024 00:45:46 -0500