diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2018-12-20 14:31:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-20 14:32:05 (GMT) |
| commit | 9c41382165cef2524eb2aeff862e6961545f2305 (patch) | |
| tree | b29791dc46cac0dab8f439032339276a169747cf /Help | |
| parent | 0495ce4f98497ba607c5d297f2d5dee70d9a36c6 (diff) | |
| parent | b99448e0160d5ca90feaf1431a826953c61275f3 (diff) | |
| download | CMake-9c41382165cef2524eb2aeff862e6961545f2305.zip CMake-9c41382165cef2524eb2aeff862e6961545f2305.tar.gz CMake-9c41382165cef2524eb2aeff862e6961545f2305.tar.bz2 | |
Merge topic 'doc-stage'
b99448e016 Help/dev: Document where topic stage branch is held
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2753
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/dev/review.rst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Help/dev/review.rst b/Help/dev/review.rst index a524115..0c4eded 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -323,6 +323,14 @@ branch (e.g. ``master``) branch followed by a sequence of merges each integrating changes from an open MR that has been staged for integration testing. Each time the target integration branch is updated the stage is rebuilt automatically by merging the staged MR topics again. +The branch is stored in the upstream repository by special refs: + +* ``refs/stage/master/head``: The current topic stage branch. + This is used by continuous builds that report to CDash. +* ``refs/stage/master/nightly/latest``: Topic stage as of 1am UTC each night. + This is used by most nightly builds that report to CDash. +* ``refs/stage/master/nightly/<yyyy>/<mm>/<dd>``: Topic stage as of 1am UTC + on the date specified. This is used for historical reference. `CMake GitLab Project Developers`_ may stage a MR for integration testing by adding a comment with a command among the `comment trailing lines`_:: |