|
|
@@ -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='[email protected]' \
|
|
|
- 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
|