From owner-cvs-all Mon Jun 26 15:56:19 2000 Delivered-To: cvs-all@freebsd.org Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38]) by hub.freebsd.org (Postfix) with ESMTP id 5262937B814; Mon, 26 Jun 2000 15:56:14 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (root@trang.nuxi.com [209.152.133.57]) by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id PAA20962; Mon, 26 Jun 2000 15:56:11 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.9.3/8.9.1) id PAA14495; Mon, 26 Jun 2000 15:56:08 -0700 (PDT) (envelope-from obrien) Date: Mon, 26 Jun 2000 15:56:08 -0700 From: "David O'Brien" To: Brian Fundakowski Feldman Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh canohost.c ssh.h sshd.c Message-ID: <20000626155608.B12194@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <20000626142054.A2392@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i In-Reply-To: ; from green@FreeBSD.org on Mon, Jun 26, 2000 at 06:20:40PM -0400 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, Jun 26, 2000 at 06:20:40PM -0400, Brian Fundakowski Feldman wrote: > for the next import, the $FreeBSD$ line should probably be removed, and > the file will be reverted to being on the vendor branch. Forgot to mention. Just how is this going to happen? As I said before, the next vendor import *will* cause a conflict. The importer can only deal with this via a `cvs ci'. We all know that it is impossible to do so w/o $FreeBSD$. > What _is_ it that you are so concerned about harming? The amount of effort now required to do a vendor import. You misunderstand the amount of effort. -- -- David (obrien@FreeBSD.org) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message