summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-01-05 14:06:42 (GMT)
committerBrad King <brad.king@kitware.com>2012-01-05 14:06:42 (GMT)
commit2f5b677186615c0626b3670afdc4bddec8fbf17e (patch)
tree1e9b412777078a126150b7880957bccce362018a /Utilities
parent156cb3bbf257f747672eac945fa2e19d33fc3a63 (diff)
downloadCMake-2f5b677186615c0626b3670afdc4bddec8fbf17e.zip
CMake-2f5b677186615c0626b3670afdc4bddec8fbf17e.tar.gz
CMake-2f5b677186615c0626b3670afdc4bddec8fbf17e.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 bbd9e8b..45cb093 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 2f4a3792
+ git branch libarchive-upstream 4f4fe6e5
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 2f4a3792
+ git log 4f4fe6e5
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='2011-12-19 18:30:59 -0500' \
- git commit -m 'libarchive 3.0.1-r3950 (reduced)' &&
+ GIT_AUTHOR_DATE='2011-12-31 13:54:34 -0500' \
+ git commit -m 'libarchive 3.0.2-r4051 (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the