From owner-cvs-all Sun Jun 30 7:55:19 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37ED637B400; Sun, 30 Jun 2002 07:55:15 -0700 (PDT) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D11343E09; Sun, 30 Jun 2002 07:55:13 -0700 (PDT) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id B4E485349; Sun, 30 Jun 2002 16:55:11 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Anders Nordby Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh-portable CREDITS ChangeLog FREEBSD-Xlist FREEBSD-upgrade INSTALL LICENCE Makefile.in OVERVIEW README README.privsep README.smartcard RFC.nroff TODO WARNING.RNG acconfig.h aclocal.m4 atomicio.c atomicio.h auth-bsdauth.c ... References: <200206301358.g5UDwQDj063266@freefall.freebsd.org> <20020630143534.GA10205@totem.fix.no> From: Dag-Erling Smorgrav Date: 30 Jun 2002 16:55:10 +0200 In-Reply-To: <20020630143534.GA10205@totem.fix.no> Message-ID: Lines: 20 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Anders Nordby writes: > > Die! > This is not very informative. True. Here's the deal: I originally imported "portable" OpenSSH into src/crypto/openssh-portable because I was worried about making a mess of things if I tried to import it on top of "non-portable" OpenSSH. Once I'd finished the merge and switched us over, Peter contacted me and explained to me how to redo the import in the correct location. I reimported 3.3p1 in src/crypto/openssh, removed the remnants of "non-portable" OpenSSH, recommitted our patches, then imported 3.4p1 (which had been released in the interim) on top of that again, resolved the conflicts, and pointed the Makefiles back to the original location. Since src/crypto/openssh-portable is now unused, and only existed in HEAD for a few days, it will be removed from the repository once the dust has settled; hence this 'cvs rm'. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message