git-merge-for-testing.sh

   1 #!/bin/bash
   2
   3 # I developed each fix or feature in a separate topic branch on top of
   4 # upstream 0.53.
   5 #
   6 # This script quickly merges all the topic branch I want into
   7 # a new branch for testing.
   8 #
   9 # It shouldn't be considered safe to pull from this testing branch
  10 # because whenever I change a patch, it becomes a "new" branch not
  11 # inheriting from the old variant:
  12 #
  13 # if I change a patch, I reset the testing branch, edit the patch,
  14 # then re-create the testing branch from here with:
  15 #
  16 #     git checkout -b TEST
  17 #     ./git-merge-for-testing.sh
  18
  19 # (Hopefully, git-rerere helps me not to resolve conflicts too often.)
  20 #
  21 # If merging breaks, fix the conflicts, and simply re-run this script.
  22 # It should continue merging (already completed merges will result in
  23 # a trivial fast-forward, i.e., skipped.)
  24
  25 merge() {
  26     for b in "$@"; do
  27         if ! git merge -v --log --rerere-autoupdate "$b"; then
  28             if git rerere status; then
  29                 git commit
  30             else
  31                 echo $"Fix the conflicts manually, and proceed by re-reunning this script!"
  32                 exit 1
  33             fi
  34         fi
  35     done
  36 }
  37
  38 set -ex
  39
  40 merge \
  41     syntax/code \
  42     syntax/links-always-explicit \
  43     syntax/complex-tables-boring \
  44     pretty/strip_aname \
  45     pretty/strip_fonts_on_blank \
  46     pretty/typography_degrees \
  47     dirtyhack/strip_underline_blank \
  48     dirtyhack/join-adjacent-fonts \
  49     pretty/links-explicit-only-necessary \
  50     dirtyhack/bodylevel-tables-boring
  51
  52 # Finally, also inherit formally from my old version to allow git-pull
  53 # for those who have got my old version.
  54 git merge -v -s ours 0.54_imz0 \
  55     -m 'Formal merge to indicate that the new version supercedes the previous release.'