Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Sep 2001 11:17:21 +0300
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        Matt Dillon <dillon@earth.backplane.com>
Cc:        Josef Karthauser <joe@FreeBSD.org>, freebsd-stable@FreeBSD.org, Mike Silbersack <silby@silby.com>, Ian Dowse <iedowse@maths.tcd.ie>, Kirk McKusick <mckusick@mckusick.com>, Grigoriy Orlov <gluk@ptci.ru>
Subject:   Re: dirpref MFC to -stable: patch set to test
Message-ID:  <20010919111721.E40402@sunbay.com>
In-Reply-To: <200109190106.f8J16jv50999@earth.backplane.com>; from dillon@earth.backplane.com on Tue, Sep 18, 2001 at 06:06:45PM -0700
References:  <200109190106.f8J16jv50999@earth.backplane.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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?

On Tue, Sep 18, 2001 at 06:06:45PM -0700, Matt Dillon wrote:
> @@ -36,7 +36,7 @@
>  static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
>  #endif
>  static const char rcsid[] =
> -  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.29.2.5 2001/08/01 08:41:02 obrien Exp $";
> +  "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.36 2001/04/10 08:38:52 mckusick Exp $";
>  #endif /* not lint */
>  
>  #include <err.h>
[...]
> @@ -30,7 +30,7 @@
>  .\" SUCH DAMAGE.
>  .\"
>  .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
> -.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.26.2.7 2001/07/22 11:32:31 dd Exp $
> +.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.37 2001/04/10 10:36:43 nik Exp $
>  .\"
>  .Dd December 19, 2000
>  .Dt NEWFS 8
[...]
> @@ -42,7 +42,7 @@
>  static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
>  #endif
>  static const char rcsid[] =
> -  "$FreeBSD: src/sbin/newfs/newfs.c,v 1.30.2.4 2001/05/28 02:34:31 obrien Exp $";
> +  "$FreeBSD: src/sbin/newfs/newfs.c,v 1.35 2001/04/10 08:38:52 mckusick Exp $";
>  #endif /* not lint */
>  
>  /*

-- 
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010919111721.E40402>