move emacs.git melete & athena/unstable branches documentation here

1 files changed, 55 insertions, 0 deletions

diff --git a/.mrconfig.in b/.mrconfig.in
index ed3c0e59..3fd25c0d 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -423,6 +423,61 @@ post_checkout =
     install-git-hooks pandoc-citeproc-preamble
 skip = lazy
 
+# 'master' branch: just for installing changes to upstream master
+#
+# 'melete' branch:
+#
+#     Rebased onto sv.gnu.org's master branch.  It has
+#
+#       - patch(es) to integrate these development builds with my Debian
+#         workstation setup, just enough that I can use these builds day-to-day;
+#         these assume a sufficiently recent emacs-snapshot package from demeter
+#         is installed, to provide /usr/share/emacs-snapshot/site-lisp/elpa
+#
+#       - bug fixes, reversions etc., (cleaned up versions of) which have not
+#         yet made it onto sv.gnu.org's master, but which are required for my
+#         own usage
+#
+#       - WIP patches of my own -- this branch is used for my own development
+#         work, at least where that doesn't require long-lived feature branches.
+#
+#     A key advantage of using these development builds is that references to
+#     files in *Help* buffers will be to ~/src/emacs, not to somewhere owned by
+#     root.  The branch is named after my laptop at the time I first set it up.
+#
+# 'athena/unstable' branch:
+#
+#     Merges from sv.gnu.org's master branch only.  .deb packages produced from
+#     this branch are available from <http://silentflame.com/debian>.  There are
+#     two purposes:
+#
+#       - providing byte-compiled Lisp /usr/share/emacs-snapshot/site-lisp/elpa
+#         to builds from the 'melete' branch
+#
+#       - direct use on machines other than my development laptop where I want
+#         something more current than the stable release of Emacs but not with
+#         my current WIP.
+#
+#     Updated only when new fixes, features or reversions on sv.gnu.org's
+#     master branch are wanted on machines other than my development laptop.
+#     To do that, first 'melete' is updated using 'mr pull', and then I run
+#     that build for a day or so.  Then update this branch using
+#     debian/merge-snapshot script with the commit onto which 'melete' was
+#     rebased.  Use 'dgit sbuild -d CODENAME' to get something to test, and
+#     then use rebuild-for-athena to build, tag and upload.
+#
+#     It is important to test local installability of the new .deb before
+#     running release-to-athena, because running the rebased 'melete' branch
+#     doesn't detect any byte compilation issues against my current selection of
+#     elpa-* packages. After installing the new .deb, also test
+#     '/opt/emacs-snapshot/bin/emacs --debug-init'.
+#
+# 'athena/CODENAME-bpo' branch:
+#
+#     Backported from athena/unstable.  Automatically updated by
+#     rebuild-for-athena when updating athena/unstable as described above.
+#
+# See also scripts/desktop/emacsclient in dotfiles.git.
 [src/emacs]
 checkout = git clone https://git.savannah.gnu.org/git/emacs.git emacs
 post_clean = ./autogen.sh autoconf