summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-06-09 18:45:14 +0000
committerintrigeri <intrigeri@boum.org>2018-06-09 18:45:14 +0000
commita91a08eb048b40a48ae70003e77e8113954b41f7 (patch)
treee47b4f1f80f1d06b6de9bdb1e2d36ec8f5e9003e
parente9701e8dcd9546883724de7bb9ca49d1d6eee12f (diff)
parent7eb3690d74c7dbe673aadc5d2d27e4df3f304550 (diff)
Merge remote-tracking branch 'origin/master' into stable
-rw-r--r--wiki/src/contribute/release_process.mdwn11
1 files changed, 3 insertions, 8 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 039ff89..6878efc 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -302,15 +302,10 @@ Update other base branches
1. Merge the release branch into `devel` following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
-2. Merge `devel` into `feature/buster` following the instructions for
+2. Merge `devel` into `feature/buster`, *without* following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
- Given that these two branches' APT suites have diverged a lot, and
- that `tails-merge-suite` currently happily overwrites newer
- packages in the target with older packages from the source, it's
- probably easier to just merge each individual APT overlay that was
- just merged into the release branch into `feature/buster`'s APT
- suite. Also, most of our just upgraded bundled packages
- (e.g. `tails-greeter`) may need to be rebuilt for Stretch.
+ (For now `feature/buster` is handled as any other topic branch
+ forked off `devel`: its base branch is set to `devel`.)
3. Ensure that the release, `devel` and `feature/buster` branches
have the expected content in `config/APT_overlays.d/`: e.g. it must