From owner-cvs-all Mon Jun 26 15:20:51 2000 Delivered-To: cvs-all@freebsd.org Received: from localhost (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id 3BDC137BA20; Mon, 26 Jun 2000 15:20:41 -0700 (PDT) (envelope-from green@FreeBSD.org) Date: Mon, 26 Jun 2000 18:20:40 -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: <20000626142054.A2392@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 05:02:39PM -0400, Brian Fundakowski Feldman wrote: > > You're most likely right about that. Pardon my ignorance, but what is the > > actual harm done by taking another file off the vendor branch, this one > > being only a couple hundred lines? I thought that it was only because the > > file would be duplicated in the repository. > > Grrrr. Do you not read your committers mail?? Have you missed all the > many treaties on this in the past 3 months? It has been explained *MANY* > times in 2000 alone. Please go see the archives search for "vendor > branch". > > The fact you don't understand also tells me you are not ready to commit > to src/contrib (aka src/crypto/ in this case) w/o a review. I understand it's not supposed to be done for trivial/cosmetic changes. I know that conflicts have to be merged. I checked the committers guide again to make sure that there was no other reason, and according to it, there is no other reason; so for the next import, the $FreeBSD$ line should probably be removed, and the file will be reverted to being on the vendor branch. There is a bit more code in the repository (a _TINY_ bit! take a look), and the next import will merge the $FreeBSD$ line (unless it's removed), and not cause conflicts because the -same- code will be in both bases WRT what I just committed. What _is_ it that you are so concerned about harming? Don't you try to get the GCC people to accept changes you've made and then sometimes revert files to the vendor branch when you've been able to do so? > -- > -- 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