summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/APT_repository/custom.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/contribute/APT_repository/custom.mdwn')
-rw-r--r--wiki/src/contribute/APT_repository/custom.mdwn30
1 files changed, 20 insertions, 10 deletions
diff --git a/wiki/src/contribute/APT_repository/custom.mdwn b/wiki/src/contribute/APT_repository/custom.mdwn
index 1311e21..c0837d2 100644
--- a/wiki/src/contribute/APT_repository/custom.mdwn
+++ b/wiki/src/contribute/APT_repository/custom.mdwn
@@ -209,29 +209,39 @@ When a Git *main* branch (`devel`, `testing`, `stable`,
`feature/jessie`) is merged into another *main* branch, the corresponding
operation must be done on the APT suites.
+0. Set some environment variables:
+
+ WORKDIR=$(mktemp -d)
+ # the branch you want to merge
+ SRC=stable
+ # the branch you want to merge _into_
+ DST=devel
+
1. Save the list of packages currently present in the APT suite we
- want to merge *into*, e.g. `reprepro list devel`.
+ want to merge *into*:
+
+ ssh reprepro@incoming.deb.tails.boum.org \
+ reprepro list "$DST" \
+ > "$WORKDIR/$DST.orig.list"
2. Make sure you are not going to overwrite newer packages with
- older ones (hint: use the `tails-diff-suites` script).
+ older ones:
-3. Merge the APT suites:
+ ssh reprepro@incoming.deb.tails.boum.org \
+ tails-diff-suites "$SRC" "$DST"
- 1. Set some environment variables:
+ … and look for packages that are newer in `$DST` than in `$SRC`.
- # the branch you want to merge
- SRC=stable
- # the branch you want to merge _into_
- DST=devel
+3. Merge the APT suites:
- 2. Merge in Git and APT:
+ 1. Merge in Git and APT:
git checkout "$DST" && \
git merge "$SRC" && \
ssh reprepro@incoming.deb.tails.boum.org \
tails-merge-suite "$SRC" "$DST"
- 3. Restore the `config/base_branch` if needed:
+ 2. Restore the `config/base_branch` if needed:
echo "${DST}" > config/base_branch && \
git commit config/base_branch -m "Restore ${DST}'s base branch." || :