svn commit: r291722 - in stable/9: crypto/openssl crypto/openssl/apps crypto/openssl/crypto crypto/openssl/crypto/asn1 crypto/openssl/crypto/des/t crypto/openssl/crypto/evp crypto/openssl/doc crypt...

[Alexey Dokuchaev]

On Thu, Dec 03, 2015 at 09:24:41PM +0000, Jung-uk Kim wrote:
> New Revision: 291722
> URL: https://svnweb.freebsd.org/changeset/base/291722
> 
> Log:
>   Merge OpenSSL 0.9.8zh.
> 
> Added:
>   stable/9/crypto/openssl/doc/dir-locals.example.el
>      - copied unchanged from r291711, vendor-crypto/openssl/dist-0.9.8/doc/dir-locals.example.el
>   stable/9/crypto/openssl/doc/openssl-c-indent.el
>      - copied unchanged from r291711, vendor-crypto/openssl/dist-0.9.8/doc/openssl-c-indent.el
> Deleted:
>   stable/9/crypto/openssl/crypto/des/t/test
>   stable/9/crypto/openssl/test/bctest
>   stable/9/crypto/openssl/util/pod2mantest
> ...

Hi,

I want to bring OpenSSL in stable/8 on par with stable/9, given that they
are both 0.9.8 it should be feasible and makes sense.  The latest 0.9.8zh
version was merged to stable/9, but not to stable/8.

I need some advice on how to perform the merge properly, as SVN does not
quite like what I'm doing (per Subversion Primer in the Committer's Guide):

  $ cd /usr/src/8/crypto/openssl
  $ svn up
  $ svn merge --accept=postpone svn+ssh://repo.freebsd.org/base/vendor-crypto/openssl/dist-0.9.8 .
  svn: E195016: 'svn+ssh://repo.freebsd.org/base/vendor-crypto/openssl/dist-0.9.8@326791' must be ancestrally related to 'svn+ssh://repo.freebsd.org/base/stable/8/crypto/openssl@326791'

./danfe