[Cmake-commits] CMake branch, master, updated. v3.10.2-925-g7c30a3a
Kitware Robot
kwrobot at kitware.com
Thu Jan 25 09:55:05 EST 2018
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 7c30a3a3c321575ee8f3bd82b9e617456c2a7396 (commit)
via bb33bb657efef38f98a780e5eb2341e34b4b9b27 (commit)
from fa3ac83af0edf958d26b246109db6e3d6d128d70 (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=7c30a3a3c321575ee8f3bd82b9e617456c2a7396
commit 7c30a3a3c321575ee8f3bd82b9e617456c2a7396
Merge: fa3ac83 bb33bb6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 25 14:47:41 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jan 25 09:47:45 2018 -0500
Merge topic 'doc-dev-release'
bb33bb65 Help/dev: Add log step to 'release' branch instructions
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1700
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb33bb657efef38f98a780e5eb2341e34b4b9b27
commit bb33bb657efef38f98a780e5eb2341e34b4b9b27
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 25 09:44:04 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 25 09:44:36 2018 -0500
Help/dev: Add log step to 'release' branch instructions
Extend the maintainer guide with a reminder to self-review the
new ancestry of the `release` and `master` branches to ensure
that nothing unexpected was merged.
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index bdfb3d0..ec76479 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -73,6 +73,13 @@ Merge the ``release-$ver`` branch to ``master``:
git pull
git merge --no-ff release-$ver
+Review new ancestry to ensure nothing unexpected was merged to either branch:
+
+.. code-block:: shell
+
+ git log --graph --boundary origin/master..master
+ git log --graph --boundary origin/release..release-$ver
+
Publish both ``master`` and ``release`` simultaneously:
.. code-block:: shell
-----------------------------------------------------------------------
Summary of changes:
Help/dev/maint.rst | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list