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 4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd (commit)
via 014afaee8ec78763f9d731a90e72263b6c7539d3 (commit)
from 4b2710c1aeffcdfe18e3afc01c8e4f7ce2ed02c8 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd
commit 4501785e4beb907230ba8b6b2d0bdeaeda4d3fdd
Merge: 4b2710c 014afae
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 3 12:17:56 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 3 12:17:56 2012 -0400
Merge topic 'ctest-svn-update' into next
014afae cmCTestSVN: Do not hide base class DoRevision method
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=014afaee8ec78763f9d731a90e72263b6c7539d3
commit 014afaee8ec78763f9d731a90e72263b6c7539d3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 3 12:16:12 2012 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Sep 3 12:16:12 2012 -0400
cmCTestSVN: Do not hide base class DoRevision method
Since cmCTestSVN overrides the Revision structure the DoRevision method
signature changes. Rename the new signature to avoid hiding the
original.
diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index 2fd4440..9628ee9 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -354,7 +354,7 @@ private:
{
if(strcmp(name, "logentry") == 0)
{
- this->SVN->DoRevision(this->Rev, this->Changes);
+ this->SVN->DoRevisionSVN(this->Rev, this->Changes);
}
else if(strcmp(name, "path") == 0 && !this->CData.empty())
{
@@ -423,8 +423,8 @@ void cmCTestSVN::LoadRevisions(SVNInfo &svninfo)
}
//----------------------------------------------------------------------------
-void cmCTestSVN::DoRevision(Revision const& revision,
- std::vector<Change> const& changes)
+void cmCTestSVN::DoRevisionSVN(Revision const& revision,
+ std::vector<Change> const& changes)
{
// Guess the base checkout path from the changes if necessary.
if(this->RootInfo->Base.empty() && !changes.empty())
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 571af8c..9fc2008 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -78,8 +78,8 @@ private:
void GuessBase(SVNInfo &svninfo, std::vector<Change> const& changes);
- void DoRevision(Revision const& revision,
- std::vector<Change> const& changes);
+ void DoRevisionSVN(Revision const& revision,
+ std::vector<Change> const& changes);
void WriteXMLGlobal(std::ostream& xml);
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestSVN.cxx | 6 +++---
Source/CTest/cmCTestSVN.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
