From owner-svn-src-stable@freebsd.org Tue Dec 12 08:05:34 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11A0AE91225; Tue, 12 Dec 2017 08:05:34 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1D9C71495; Tue, 12 Dec 2017 08:05:33 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1033) id 34AEC693D; Tue, 12 Dec 2017 08:05:33 +0000 (UTC) Date: Tue, 12 Dec 2017 08:05:33 +0000 From: Alexey Dokuchaev To: Jung-uk Kim Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: 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... Message-ID: <20171212080533.GA46364@FreeBSD.org> References: <201512032124.tB3LOfEX046377@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201512032124.tB3LOfEX046377@repo.freebsd.org> User-Agent: Mutt/1.9.1 (2017-09-22) X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2017 08:05:34 -0000 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