cvs commit: src/lib/libc/stdio vfwscanf.c
David Schultz
das at FreeBSD.ORG
Mon May 3 00:25:50 PDT 2004
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.
More information about the cvs-src
mailing list