From owner-cvs-all Wed Aug 28 19:23:28 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE93337B401; Wed, 28 Aug 2002 19:23:22 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F1943E4A; Wed, 28 Aug 2002 19:23:22 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 614302A7D6; Wed, 28 Aug 2002 19:23:22 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Mark Murray Cc: Gregory Neil Shapiro , cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/sendmail/mail.local mail.local.8 mail.local.c src/contrib/sendmail/mailstats mailstats.c src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/praliases praliases.c src/contrib/sendmail/rmail rmail.c src/contrib/sendmail/smrsh ... In-Reply-To: <200208281958.g7SJwpl5033338@grimreaper.grondar.org> Date: Wed, 28 Aug 2002 19:23:22 -0700 From: Peter Wemm Message-Id: <20020829022322.614302A7D6@canning.wemm.org> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Mark Murray wrote: > > Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so > > I don't have to manually resolve conflicts on every import. Ironically, > > most of these files have no changes from the vendor version except the > > $FreeBSD$ line. > > Do any of them have NO appreciable history? If so, manually cleaning > up the files (by a CVS-Meister) may be on the cards. Let us know > which files are affected :-). They used to refer to them, which breaks old releases that refer to the intermediate revisions that we'd otherwise be removing. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message