[Cmake-commits] CMake branch, master, updated. v3.12.0-313-ge500d60

[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  e500d6074112c975c96678c0c5f38a2b7e9718b6 (commit)
       via  6161a64a529d8c7a5ba4e0d8a777605a0558f2ad (commit)
      from  0ff961f1885e55b5f47c0d0d52c7dd5f88b082a3 (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=e500d6074112c975c96678c0c5f38a2b7e9718b6
commit e500d6074112c975c96678c0c5f38a2b7e9718b6
Merge: 0ff961f 6161a64
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 26 14:20:34 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 26 10:20:39 2018 -0400

    Merge topic 'maint_clarify_merge_process'
    
    6161a64a52 maint: Add further details about merging topics to release branch
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2238


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6161a64a529d8c7a5ba4e0d8a777605a0558f2ad
commit 6161a64a529d8c7a5ba4e0d8a777605a0558f2ad
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Wed Jul 25 22:54:37 2018 +1000
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Thu Jul 26 07:41:19 2018 +1000

    maint: Add further details about merging topics to release branch
    
    The Maintain Current Release instructions previously assumed that
    the topic branch had been merged to master. Add text to make this
    explicit in the instructions as an initial verification step.
    
    The previous instructions also made no mention of the commit
    message for the merge to the release branch. This needs to include
    a footer that mentions the merge request number for tracking
    purposes.

diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index ec76479..a8942cd7 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -51,15 +51,18 @@ 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:
+Before merging a ``$topic`` branch into ``release``, verify that the
+``$topic`` branch has already been merged to ``master`` via the usual
+``Do: merge`` process.  Then, to merge the ``$topic`` branch into
+``release``, start by creating 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:
+Merge the ``$topic`` branch into the local ``release-$ver`` branch, making
+sure to include a ``Merge-request: !xxxx`` footer in the commit message:
 
 .. code-block:: shell
 

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

Summary of changes:
 Help/dev/maint.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake