From owner-cvs-all Wed Aug 28 16:53:15 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 D541137B401; Wed, 28 Aug 2002 16:53:09 -0700 (PDT) Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.157.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB87E43E42; Wed, 28 Aug 2002 16:53:08 -0700 (PDT) (envelope-from mark@grimreaper.grondar.org) Received: from storm.FreeBSD.org.uk (uucp@localhost [127.0.0.1]) by storm.FreeBSD.org.uk (8.12.5/8.12.5) with ESMTP id g7SK0KMA030487; Wed, 28 Aug 2002 21:00:20 +0100 (BST) (envelope-from mark@grimreaper.grondar.org) Received: (from uucp@localhost) by storm.FreeBSD.org.uk (8.12.5/8.12.5/Submit) with UUCP id g7SK0KTG030486; Wed, 28 Aug 2002 21:00:20 +0100 (BST) Received: from grimreaper.grondar.org (localhost [127.0.0.1]) by grimreaper.grondar.org (8.12.5/8.12.5) with ESMTP id g7SJwpl5033338; Wed, 28 Aug 2002 20:58:51 +0100 (BST) (envelope-from mark@grimreaper.grondar.org) Message-Id: <200208281958.g7SJwpl5033338@grimreaper.grondar.org> To: Gregory Neil Shapiro Cc: 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 ... References: <200208281812.g7SICYeg026432@freefall.freebsd.org> In-Reply-To: <200208281812.g7SICYeg026432@freefall.freebsd.org> ; from Gregory Neil Shapiro "Wed, 28 Aug 2002 11:12:34 PDT." Date: Wed, 28 Aug 2002 20:58:51 +0100 From: Mark Murray 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 > 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 :-). M -- o Mark Murray \_ O.\_ Warning: this .sig is umop ap!sdn To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message