[Cmake-commits] CMake branch, master, updated. v3.9.0-344-g0304408

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  0304408c6a6a01f3f3f62cd6fb08bfce8ee6b8e6 (commit)
       via  dc8930787efd049a0795986f0afcda49518d6b0b (commit)
       via  d5030124bb13ba9419ffce73828e8e7fd778d2f4 (commit)
      from  a01aa179fa2488bc049e083a8ae88066d0f556c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0304408c6a6a01f3f3f62cd6fb08bfce8ee6b8e6
commit 0304408c6a6a01f3f3f62cd6fb08bfce8ee6b8e6
Merge: a01aa17 dc89307
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Mon Jul 24 22:32:28 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 24 18:32:33 2017 -0400

    Merge topic 'doc-dev-release'
    
    dc893078 Help/dev: Add 'release' branch instructions to maintainer guide
    d5030124 CONTRIBUTING: Explain how to propose changes to the release branch
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1076


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc8930787efd049a0795986f0afcda49518d6b0b
commit dc8930787efd049a0795986f0afcda49518d6b0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 21 11:44:15 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 21 11:51:30 2017 -0400

    Help/dev: Add 'release' branch instructions to maintainer guide

diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index 889e4e3..bdfb3d0 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -37,6 +37,48 @@ command to integrate a merge request.  Please check at least the following:
   introduced.  (Learn to tolerate spurious failures due to idiosyncrasies
   of various nightly builders.)
 
+* Ensure that the MR targets the ``master`` branch.  A MR intended for
+  the ``release`` branch should be based on ``release`` but still merged
+  to ``master`` first (via ``Do: merge``).  A maintainer may then merge
+  the MR topic to ``release`` manually.
+
+Maintain Current Release
+========================
+
+The ``release`` branch is used to maintain the current release or release
+candidate.  The branch is published with no version number but maintained
+using a local branch named ``release-$ver``, where ``$ver`` is the version
+number of the current release in the form ``$major.$minor``.  It is always
+merged into ``master`` before publishing.
+
+To merge some ``$topic`` branch into ``release``, first create the local
+branch:
+
+.. code-block:: shell
+
+  git fetch origin
+  git checkout -b release-$ver origin/release
+
+Merge the ``$topic`` branch into the local ``release-$ver`` branch:
+
+.. code-block:: shell
+
+  git merge --no-ff $topic
+
+Merge the ``release-$ver`` branch to ``master``:
+
+.. code-block:: shell
+
+  git checkout master
+  git pull
+  git merge --no-ff release-$ver
+
+Publish both ``master`` and ``release`` simultaneously:
+
+.. code-block:: shell
+
+  git push --atomic origin master release-$ver:release
+
 .. _`CMake Review Process`: review.rst
 .. _`CMake CDash Page`: https://open.cdash.org/index.php?project=CMake
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5030124bb13ba9419ffce73828e8e7fd778d2f4
commit d5030124bb13ba9419ffce73828e8e7fd778d2f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 21 11:26:56 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 21 11:31:59 2017 -0400

    CONTRIBUTING: Explain how to propose changes to the release branch

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index e219763..3c84c2b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -27,9 +27,12 @@ To contribute patches:
 #. Run `Utilities/SetupForDevelopment.sh`_ for local configuration.
 #. See the `CMake Source Code Guide`_ for coding guidelines.
 #. Base all new work on the upstream ``master`` branch.
+   Base work on the upstream ``release`` branch only if it fixes a
+   regression or bug in a feature new to that release.
 #. Create commits making incremental, distinct, logically complete changes.
 #. Push a topic branch to a personal repository fork on GitLab.
-#. Create a GitLab Merge Request targeting the upstream ``master`` branch.
+#. Create a GitLab Merge Request targeting the upstream ``master`` branch
+   (even if the change is intended for merge to the ``release`` branch).
 
 The merge request will enter the `CMake Review Process`_ for consideration.
 

-----------------------------------------------------------------------

Summary of changes:
 CONTRIBUTING.rst   |    5 ++++-
 Help/dev/maint.rst |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake