From owner-cvs-all@FreeBSD.ORG Fri Jun 15 16:31:48 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.ORG Delivered-To: cvs-all@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4EE9716A46C; Fri, 15 Jun 2007 16:31:48 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id EB92313C468; Fri, 15 Jun 2007 16:31:47 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 1A6B4EB0B8E; Sat, 16 Jun 2007 00:31:47 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id IA0qSA6yGIM4; Sat, 16 Jun 2007 00:31:45 +0800 (CST) Received: from charlie.delphij.net (unknown [61.51.104.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id 01D4AEB0B90; Sat, 16 Jun 2007 00:31:44 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:cc:subject: references:in-reply-to:x-enigmail-version:openpgp:content-type:content-transfer-encoding; b=uKLM2Zu1IDUfgH6p4ryTTSEGOucE7P8cb4zTbMndY4BMa8DKYbZjQ/btsJtl0+os2 hNxbpr8jMZ3tCFVEpEvUA== Message-ID: <4672BEF0.2060608@delphij.net> Date: Sat, 16 Jun 2007 00:31:44 +0800 From: Xin LI User-Agent: Thunderbird 2.0.0.4 (X11/20070615) MIME-Version: 1.0 To: John Baldwin References: <200706150722.l5F7MRMc043046@repoman.freebsd.org> <200706151151.20187.jhb@freebsd.org> In-Reply-To: <200706151151.20187.jhb@freebsd.org> X-Enigmail-Version: 0.95.1 OpenPGP: url=http://www.delphij.net/delphij.asc Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.ORG, src-committers@FreeBSD.ORG, Xin LI , cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/diff diff.c diff.h prepend_args.c prepend_args.h sdiff.c util.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2007 16:31:48 -0000 John Baldwin wrote: > On Friday 15 June 2007 03:22:26 am Xin LI wrote: >> delphij 2007-06-15 07:22:26 UTC >> >> FreeBSD src repository >> >> Removed files: >> contrib/diff diff.c diff.h prepend_args.c >> prepend_args.h sdiff.c util.c >> Log: >> Remove files that were taken off vendor branch. Difference >> against vendor branch is now maintained in patchsets. > > This seems like a really odd approach to take. Why bother using source code > control if we are going to use patches anyway? Is this an effort to keep the > vendor branch clean to avoid pissing off certain people? Well, the reason behind this was that diffutils is being actively maintained, yet we do want to keep some local changes that is not expected to be accepted by upstream; on the other hand the way CVS handles vendor branch is not quite ideal (once a file is off the branch, we can never put it back even when upstream accepted it without heavy repository magic). Moreover, follow up commit which mixes vendor changes (to "resolve conflicts") and new local changes (perhaps to make it build, etc) makes reviewing harder. I can, of course, switch to another way if most people think that it is better, however, my own experience with CVS's vendor branch is that keeping files on the vendor branch rather than taking it off in response of emergency events (like security updates, for instance) would save a lot of time the next time we imported new stuff, and reduce the reviewing diff size by not including much vendor changes into it. Cheers,