From owner-cvs-src@FreeBSD.ORG  Mon May  3 00:25:50 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B90B916A4CE; Mon,  3 May 2004 00:25:50 -0700 (PDT)
Received: from VARK.homeunix.com (adsl-68-124-137-57.dsl.pltn13.pacbell.net
	[68.124.137.57])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 47CCE43D5F; Mon,  3 May 2004 00:25:50 -0700 (PDT)
	(envelope-from das@FreeBSD.ORG)
Received: from VARK.homeunix.com (localhost [127.0.0.1])
	by VARK.homeunix.com (8.12.10/8.12.10) with ESMTP id i437PVnx014294;
	Mon, 3 May 2004 00:25:31 -0700 (PDT)
	(envelope-from das@FreeBSD.ORG)
Received: (from das@localhost)
	by VARK.homeunix.com (8.12.10/8.12.10/Submit) id i437PVE3014293;
	Mon, 3 May 2004 00:25:31 -0700 (PDT)
	(envelope-from das@FreeBSD.ORG)
Date: Mon, 3 May 2004 00:25:30 -0700
From: David Schultz <das@FreeBSD.ORG>
To: "David O'Brien" <obrien@FreeBSD.ORG>
Message-ID: <20040503072530.GA14247@VARK.homeunix.com>
Mail-Followup-To: David O'Brien <obrien@FreeBSD.ORG>,
	Tim Robbins <tjr@FreeBSD.ORG>, src-committers@FreeBSD.ORG,
	cvs-src@FreeBSD.ORG, cvs-all@FreeBSD.ORG
References: <200405022013.i42KDTk1064157@repoman.freebsd.org>
	<20040503035654.GA93315@cat.robbins.dropbear.id.au>
	<20040503060649.GA1773@dragon.nuxi.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040503060649.GA1773@dragon.nuxi.com>
cc: cvs-src@FreeBSD.ORG
cc: src-committers@FreeBSD.ORG
cc: cvs-all@FreeBSD.ORG
cc: Tim Robbins <tjr@FreeBSD.ORG>
Subject: Re: cvs commit: src/lib/libc/stdio vfwscanf.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2004 07:25:50 -0000

On Sun, May 02, 2004, David O'Brien wrote:
> On Mon, May 03, 2004 at 01:56:54PM +1000, Tim Robbins wrote:
> > On Sun, May 02, 2004 at 01:13:29PM -0700, David E. O'Brien wrote:
> > 
> > > obrien      2004/05/02 13:13:29 PDT
> > > 
> > >   FreeBSD src repository
> > > 
> > >   Modified files:
> > >     lib/libc/stdio       vfwscanf.c 
> > >   Log:
> > >   Remove bogus FBSDID.
> > 
> > These weren't bogus -- they showed the revision of the single-byte version
> > that the files corresponded to, so that it was easy to see which changes
> > needed to be merged across.
> 
> One shouldn't have duplicate __FBSDID()'s.  To do what you wanted to do,
> one should grab the CVS info and put it in the file header comment
> section prefixed with "From: ". :-)

Moreover, if you put it in a /*-style comment, people like me
won't break the build as a result of cut-and-paste-o's that happen
after merging and testing.  Whups.  Thanks for fixing it, David.

Personally, I'd actually prefer that the second set of tags stay
deleted.  I don't know how easy they are to manage with P4, but
they're a PITA to do manually with CVS.  The CVS logs ought to be
sufficient to see what changes need to be merged, without having
the extra tag.