Date: Thu, 7 Aug 2014 17:05:26 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r269676 - vendor-crypto/openssl/dist-0.9.8 Message-ID: <53e3b1d6.2a92.6a1ecdfb@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Aug 7 17:05:25 2014 New Revision: 269676 URL: http://svnweb.freebsd.org/changeset/base/269676 Log: Sync. with ^/vendor-crypto/openssl/dist/FREEBSD-upgrade. Modified: vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Modified: vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade ============================================================================== --- vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Thu Aug 7 17:00:50 2014 (r269675) +++ vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Thu Aug 7 17:05:25 2014 (r269676) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e3b1d6.2a92.6a1ecdfb>