From owner-cvs-all Wed Jan 24 1:36: 6 2001 Delivered-To: cvs-all@freebsd.org Received: from lucifer.ninth-circle.org (lucifer.bart.nl [194.158.168.74]) by hub.freebsd.org (Postfix) with ESMTP id A434137B401; Wed, 24 Jan 2001 01:35:42 -0800 (PST) Received: (from asmodai@localhost) by lucifer.ninth-circle.org (8.11.1/8.11.0) id f0O9ZcV77184; Wed, 24 Jan 2001 10:35:38 +0100 (CET) (envelope-from asmodai) Date: Wed, 24 Jan 2001 10:35:38 +0100 From: Jeroen Ruigrok van der Werven To: Archie Cobbs Cc: Kris Kennaway , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Message-ID: <20010124103537.C76574@lucifer.bart.nl> References: <20010123215539.A27564@citusc17.usc.edu> <200101240610.WAA00480@curve.dellroad.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200101240610.WAA00480@curve.dellroad.org>; from archie@dellroad.org on Tue, Jan 23, 2001 at 10:10:49PM -0800 Organisation: VIA Net.Works The Netherlands Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG -On [20010124 07:15], Archie Cobbs (archie@dellroad.org) wrote: >By hand? The "cvs update -j .. -j .." or whatever that you do after >an import should take care of all of the non-conflicting modifications >for all of the files at once. So there should be zero extra work >caused by this change, unless I'm misunderstanding something (I'm >not a CVS expert). Not totally, every modification of a file and thus taking it off the vendor branch might cause potential conflicts upon the next import. I don't understand why this fix wasn't imported on the vendor branch as a patch so that it could easily be over-imported [inventing english while we're at it] again later without the file ever leaving the vendor branch. -- Jeroen Ruigrok van der Werven VIA Net.Works The Netherlands BSD: Technical excellence at its best Network- and systemadministrator D78D D0AD 244D 1D12 C9CA 7152 035C 1138 546A B867 Misery loves company... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message