diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-08-07 17:05:25 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-08-07 17:05:25 +0000 |
| commit | 2af9154f28669943cf601ecc3c9bbbe372587787 (patch) | |
| tree | d154fac616c813ee906e78d61f73556d9c04de1f | |
| parent | 6846a6dfd06216c71f1c9d1da1fa957d0f9ce016 (diff) | |
| download | src-2af9154f28669943cf601ecc3c9bbbe372587787.tar.gz src-2af9154f28669943cf601ecc3c9bbbe372587787.zip | |
Sync. with ^/vendor-crypto/openssl/dist/FREEBSD-upgrade.
Notes
Notes:
svn path=/vendor-crypto/openssl/dist-0.9.8/; revision=269676
| -rw-r--r-- | FREEBSD-upgrade | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FREEBSD-upgrade b/FREEBSD-upgrade index 981400ccb212..ca25e730df15 100644 --- a/FREEBSD-upgrade +++ b/FREEBSD-upgrade @@ -35,20 +35,21 @@ comm -23 old new # See that files to add makes sense comm -13 old new -tar -cf - -C openssl-${OSSLVER} . | tar xf - -C dist-0.9.8 +tar -cf - -C openssl-${OSSLVER} . | tar -xf - -C dist-0.9.8 cd dist-0.9.8 comm -23 ../old ../new | xargs svn rm +# Make sure to remove empty directories comm -13 ../old ../new | xargs svn --parents add svn stat svn ci -svn cp $FSVN/vendor-crypto/openssl/dist-0.9.8 $FSVN/vendor-crypto/openssl/$OSSLVER +svn cp ^/vendor-crypto/openssl/dist-0.9.8 ^/vendor-crypto/openssl/$OSSLVER # Merge to head mkdir ../head cd ../head svn co $FSVN/head/crypto/openssl crypto/openssl -svn merge $FSVN/vendor-crypto/openssl/dist-0.9.8 crypto/openssl +svn merge ^/vendor-crypto/openssl/dist-0.9.8 crypto/openssl # Resolve conflicts manually |