From owner-cvs-all Mon Jun 26 16:44:47 2000 Delivered-To: cvs-all@freebsd.org Received: from localhost (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id 719CD37B8D4; Mon, 26 Jun 2000 16:44:41 -0700 (PDT) (envelope-from green@FreeBSD.org) Date: Mon, 26 Jun 2000 19:44:39 -0400 (EDT) From: Brian Fundakowski Feldman X-Sender: green@green.dyndns.org To: David O'Brien Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh canohost.c ssh.h sshd.c In-Reply-To: <20000626155608.B12194@dragon.nuxi.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, 26 Jun 2000, David O'Brien wrote: > 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. So is the right thing to do now to have a repo-meister revert the files and do a vendor import of the files once they get updated on the OpenBSD side? > -- > -- David (obrien@FreeBSD.org) -- Brian Fundakowski Feldman \ FreeBSD: The Power to Serve! / green@FreeBSD.org `------------------------------' To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message