[Cmake-commits] CMake branch, next, updated. v3.1.0-2316-g09bceae

[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  09bceae5b9df968d8307d898f43963b2bd305c45 (commit)
       via  53df9bce19586858ad7c9b0e80d660433be757ed (commit)
      from  b57c2977083e8bf0c8e0ae12f6b2e9db5f4a216c (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=09bceae5b9df968d8307d898f43963b2bd305c45
commit 09bceae5b9df968d8307d898f43963b2bd305c45
Merge: b57c297 53df9bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 10:06:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 22 10:06:47 2015 -0500

    Merge topic 'update-curl' into next
    
    53df9bce curl: Add README-CMake.txt


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53df9bce19586858ad7c9b0e80d660433be757ed
commit 53df9bce19586858ad7c9b0e80d660433be757ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 22 09:59:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 22 10:00:04 2015 -0500

    curl: Add README-CMake.txt
    
    Describe how to update curl from upstream.

diff --git a/Utilities/cmcurl/README-CMake.txt b/Utilities/cmcurl/README-CMake.txt
new file mode 100644
index 0000000..3f053d8
--- /dev/null
+++ b/Utilities/cmcurl/README-CMake.txt
@@ -0,0 +1,66 @@
+The Utilities/cmcurl directory contains a reduced distribution
+of the curl source tree with only the library source code and
+CMake build system.  It is not a submodule; the actual content is part
+of our source tree and changes can be made and committed directly.
+
+We update from upstream using Git's "subtree" merge strategy.  A
+special branch contains commits of upstream curl snapshots and
+nothing else.  No Git ref points explicitly to the head of this
+branch, but it is merged into our history.
+
+Update curl from upstream as follows.  Create a local branch to
+explicitly reference the upstream snapshot branch head:
+
+ git branch curl-upstream 3fe5d9bf
+
+Use a temporary directory to checkout the branch:
+
+ mkdir curl-tmp
+ cd curl-tmp
+ git init
+ git pull .. curl-upstream
+ rm -rf *
+
+Now place the (reduced) curl content in this directory.  See
+instructions shown by
+
+ git log 3fe5d9bf
+
+for help extracting the content from the upstream repo.  Then run
+the following commands to commit the new version.  Substitute the
+appropriate date and version number:
+
+ git add --all
+
+ GIT_AUTHOR_NAME='Curl Upstream' \
+ GIT_AUTHOR_EMAIL='curl-library at cool.haxx.se' \
+ GIT_AUTHOR_DATE='Wed Sep 10 08:07:58 2014 +0200' \
+ git commit -m 'curl 7.38.0 (reduced)' &&
+ git commit --amend
+
+Edit the commit message to describe the procedure used to obtain the
+content.  Then push the changes back up to the main local repository:
+
+ git push .. HEAD:curl-upstream
+ cd ..
+ rm -rf curl-tmp
+
+Create a topic in the main repository on which to perform the update:
+
+ git checkout -b update-curl master
+
+Merge the curl-upstream branch as a subtree:
+
+ git merge -s recursive -X subtree=Utilities/cmcurl \
+           curl-upstream
+
+If there are conflicts, resolve them and commit.  Build and test the
+tree.  Commit any additional changes needed to succeed.
+
+Finally, run
+
+ git rev-parse --short=8 curl-upstream
+
+to get the commit from which the curl-upstream branch must be started
+on the next update.  Edit the "git branch curl-upstream" line above to
+record it, and commit this file.

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

Summary of changes:
 Utilities/cmcurl/README-CMake.txt |   66 +++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 Utilities/cmcurl/README-CMake.txt


hooks/post-receive
-- 
CMake