summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-15 20:36:44 (GMT)
committerBrad King <brad.king@kitware.com>2014-04-15 20:36:44 (GMT)
commit61a649d974b7810ec6073ef088e1b65c1277dbda (patch)
tree2853f82b6a35b3fd581742f7135270580412dc15 /Utilities
parent4533560c23adf29a03d57b5c5678048795ed6134 (diff)
downloadCMake-61a649d974b7810ec6073ef088e1b65c1277dbda.zip
CMake-61a649d974b7810ec6073ef088e1b65c1277dbda.tar.gz
CMake-61a649d974b7810ec6073ef088e1b65c1277dbda.tar.bz2
libarchive: Update README-CMake.txt for new snapshot
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmlibarchive/README-CMake.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 7cbee4c..8f3b29b 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
Update libarchive from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
- git branch libarchive-upstream 64713ae3
+ git branch libarchive-upstream 37f225b7
Use a temporary directory to checkout the branch:
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) libarchive content in this directory. See
instructions shown by
- git log 64713ae3
+ git log 37f225b7
for help extracting the content from the upstream svn repo. Then run
the following commands to commit the new version. Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
GIT_AUTHOR_NAME='LibArchive Upstream' \
GIT_AUTHOR_EMAIL='libarchive-discuss@googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Mar 17 20:43:07 2014 -0700' \
- git commit -m 'libarchive 3.1.2-218-g00f4bd83 (reduced)' &&
+ GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
+ git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the