[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-184-gdd0648f

[Brad King]

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, next has been updated
       via  dd0648f5baa4a6ddf640191fb9c82fc300c3732b (commit)
       via  51849bbab8b1b6b8299dc08e98ca1524cc1e168a (commit)
      from  b0ea076370600cd3e6a5d04a90667c0d2a8e4727 (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=dd0648f5baa4a6ddf640191fb9c82fc300c3732b
commit dd0648f5baa4a6ddf640191fb9c82fc300c3732b
Merge: b0ea076 51849bb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 15:00:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 15:00:55 2017 -0500

    Merge topic 'fix-ctest_update-svn' into next
    
    51849bba ctest_update: Fix svn log and external loading


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51849bbab8b1b6b8299dc08e98ca1524cc1e168a
commit 51849bbab8b1b6b8299dc08e98ca1524cc1e168a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 13:43:34 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 15 14:44:37 2017 -0500

    ctest_update: Fix svn log and external loading
    
    Since commit v3.7.0-rc1~132^2 (CTestSVN: Fix segfault when
    CTEST_UPDATE_VERSION_ONLY is enabled, 2016-09-12) we do not properly
    extract svn log or externals.  After updating we erase the information
    that was loaded before updating and can no longer log the changes
    between revisions to extract authors.
    
    Fix this by only loading the repository information once, whether needed
    by `NoteOldRevision`, `NoteNewRevision`, or both.
    
    Fixes: #12630, #16646

diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index fc405ca..410e0d4 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -523,8 +523,11 @@ private:
 
 void cmCTestSVN::LoadRepositories()
 {
+  if (!this->Repositories.empty()) {
+    return;
+  }
+
   // Info for root repository
-  this->Repositories.clear();
   this->Repositories.push_back(SVNInfo(""));
   this->RootInfo = &(this->Repositories.back());
 

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

Summary of changes:
 Source/CTest/cmCTestSVN.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake