From owner-freebsd-stable Wed Sep 19 2:22:46 2001 Delivered-To: freebsd-stable@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 3A3E937B401; Wed, 19 Sep 2001 02:22:33 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f8J9L8560174; Wed, 19 Sep 2001 12:21:08 +0300 (EEST) (envelope-from ru) Date: Wed, 19 Sep 2001 12:21:08 +0300 From: Ruslan Ermilov To: Matt Dillon Cc: Josef Karthauser , freebsd-stable@FreeBSD.org Subject: Re: dirpref MFC to -stable: patch set to test Message-ID: <20010919122108.G40402@sunbay.com> References: <200109190106.f8J16jv50999@earth.backplane.com> <20010919111721.E40402@sunbay.com> <200109190909.f8J99xl53466@earth.backplane.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200109190909.f8J99xl53466@earth.backplane.com>; from dillon@earth.backplane.com on Wed, Sep 19, 2001 at 02:09:59AM -0700 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Sep 19, 2001 at 02:09:59AM -0700, Matt Dillon wrote: > > :Matt, > : > :When merging the patches, please ``cvs di -kk'' so that they > :don't affect the $FreeBSD$ lines. > : > :Joe, > : > :Can we make CVSROOT script to reject changes in the $FreeBSD$ > :lines for modified files? > > It's irrelevant, cvs will regenerate the $FreeBSD$ lines on commit anyway > so it doesn't matter *what* is in them. > It's not irrelevant, this is what will get into the ,v file. cvs(1) will regenerate the $FreeBSD$ lines on checkout only. Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message