summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-21 15:21:39 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-28 12:44:47 (GMT)
commitc09acf4fdd961a8ba9a27f9af2800e9262cd18be (patch)
tree562510d2427d64e2c4dc7bb5b07e38ca77ec852f /Utilities
parent2f940f89951027bc596edbe1a5768cc0a0ef78a0 (diff)
downloadCMake-c09acf4fdd961a8ba9a27f9af2800e9262cd18be.zip
CMake-c09acf4fdd961a8ba9a27f9af2800e9262cd18be.tar.gz
CMake-c09acf4fdd961a8ba9a27f9af2800e9262cd18be.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 8f3b29b..0a3e34a 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 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
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 37f225b7
+ git log 1a8c7bc2
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 Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the