Date: Wed, 24 Jan 2001 10:35:38 +0100 From: Jeroen Ruigrok van der Werven <jruigrok@via-net-works.nl> To: Archie Cobbs <archie@dellroad.org> Cc: Kris Kennaway <kris@FreeBSD.org>, 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> In-Reply-To: <200101240610.WAA00480@curve.dellroad.org>; from archie@dellroad.org on Tue, Jan 23, 2001 at 10:10:49PM -0800 References: <20010123215539.A27564@citusc17.usc.edu> <200101240610.WAA00480@curve.dellroad.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010124103537.C76574>