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 d8586e0c4f22c3c3a02a8761b171b76f82de0e59 (commit)
via c91e88d0e15f38616284f12fc0f2152ac6c0562c (commit)
via 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (commit)
from 3b4c9efb6ef3ca351c2490d2cab224d6977b596d (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=d8586e0c4f22c3c3a02a8761b171b76f82de0e59
commit d8586e0c4f22c3c3a02a8761b171b76f82de0e59
Merge: 3b4c9ef c91e88d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 09:16:28 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 4 09:16:28 2013 -0400
Merge topic 'update-kwsys' into next
c91e88d Merge branch 'upstream-kwsys' into update-kwsys
6dc3dd9 KWSys 2013-06-03 (d79a792e)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91e88d0e15f38616284f12fc0f2152ac6c0562c
commit c91e88d0e15f38616284f12fc0f2152ac6c0562c
Merge: 9d38db5 6dc3dd9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 09:08:58 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 09:08:58 2013 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
commit 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b
Author: KWSys Robot <kwro...@kitware.com>
AuthorDate: Mon Jun 3 11:12:00 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 09:08:54 2013 -0400
KWSys 2013-06-03 (d79a792e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ d79a792e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dccf7725..d79a792e
Brad King (1):
d79a792e SystemTools: Fix CollapseFullPath to not erase root component
Change-Id: I25c6600a621a960738b5afc0ba73f63df0693303
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 652649f..7891708 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3085,7 +3085,7 @@ SystemToolsAppendComponents(
{
if(*i == "..")
{
- if(out_components.begin() != out_components.end())
+ if(out_components.size() > 1)
{
out_components.erase(out_components.end()-1, out_components.end());
}
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/SystemTools.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
