Branch off 9.5/9.6

master is now 9.6, and 9.5 has its own branch.

Deviating from previous practice, master is now actually called "master"
on the web page, not "current".

Also add some documentation about branching.

diff --git a/wwwtools/README.md b/wwwtools/README.md
new file mode 100644 (file)
index 0000000..723b3e1
--- /dev/null
+++ b/wwwtools/README.md
@@ -0,0 +1,29 @@
+Branching
+---------
+
+The `postgresql` and `messages` repositories use the same branch
+names, but the branching is not necessarily done at the same time.
+For instance, the `master` branch usually refers to the most recent
+major release for a few month after release.  Only sometime before the
+next major release, we create a back-branch (`RELxxx`) in the
+`messages` repository and use the `master` branch for the next major
+PostgreSQL release.
+
+This can be confusing, but as long as the web interface shows the
+right things, it's manageable.
+
+When anything about the branching is to change, the following places
+might need to be updated:
+
+- Actually create a new branch and publish it, e.g.,
+
+               git checkout master
+               git pull
+               git checkout -b REL9_5_STABLE
+               git push -u origin REL9_5_STABLE
+
+- Update `update-nls-www`: This controls which branches are processed.
+
+- Update `messages-branches.txt` and `postgresql-branches.txt`: This maps to the actual branch names.
+
+- Update `nls-status-page`: This determines how the branches show up on the web page.

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 22688ef8adb0f4d0b53ea3f29981b83124100396..49e00e7869090419a59a36f30e0ef639689213c6 100644 (file)
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-9.5-branch            master
+messages-master                        master
+messages-9.5-branch            REL9_5_STABLE
 messages-9.4-branch            REL9_4_STABLE
 messages-9.3-branch            REL9_3_STABLE
 messages-9.2-branch            REL9_2_STABLE

diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index 2bae403b0cf436ce98379a50dc7cf829fe2418c1..62adfafdc36375682796f7502d76b5dc9f43dff1 100755 (executable)
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -83,7 +83,8 @@ my %branch_status = (
     '9.2-branch' => 'maintenance',
     '9.3-branch' => 'maintenance',
     '9.4-branch' => 'maintenance',
-    '9.5-branch' => 'translate this now',
+    '9.5-branch' => 'maintenance',
+    'master' => 'translate this now',
 );
 
 my @branches = map { m!table-([^/]+).html$! && $1 } reverse sort glob("$dir/table-*.html");

diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 479b33dc25f04a57ee1ca342fd1981953d6daf65..fe05125c42e2a891d0aefc588f45b07bf00e8e39 100644 (file)
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-master      master
 postgresql-9.5-branch  REL9_5_STABLE
 postgresql-9.4-branch  REL9_4_STABLE
 postgresql-9.3-branch  REL9_3_STABLE

diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index 0a7abb23091078613a44ac9134ba054332e1c7de..225aa51fe3b26bbbfe14e69d32ffce0bcfe9d705 100755 (executable)
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
        esac
 done
 
-active_branches="9.5-branch 9.4-branch 9.3-branch 9.2-branch 9.1-branch"
+active_branches="master 9.5-branch 9.4-branch 9.3-branch 9.2-branch 9.1-branch"
 
 if [ -n "$1" ]; then
        active_branches=$1