cvs commit: src/contrib/gcc FREEBSD-Xlist FREEBSD-deletelist getopt.c getopt.h getopt1.c

[Ruslan Ermilov]

On Wed, Feb 18, 2004 at 08:14:08AM +0100, Dag-Erling Sm?rgrav wrote:
> Andrey Chernov <ache at nagual.pp.ru> writes:
> > Hmm. Seeeng FREEBSD-deletelist and FREEBSD-Xlist I find that we _do_
> > remove unused files in contrib [...]
> 
> No.  FREEBSD-Xlist lists files that are deleted *before the import*.
> If you really *must* delete those files and add them to FREEBSD-Xlist,
> you must delete them on the vendor branch and not in HEAD.
> 
Not quite.  "cvs checkout -rVENDOR" should produce the same set as
"cvs checkout -rv_latest_version", so these files should not be
removed just yet.  On the next Groff and Texinfo imports though,
I will "cvs remove" files on FSF (vendor) branch that were not
imported.

Having said that, an alternative approach is to just remove such
files on HEAD, and don't touch FREEBSD-Xlist -- the next import
will report these as conflicts (if there were changes in getopt*
files), but these should be harmless.  I think I prefer to keep
it this way with Groff, and the other way with Texinfo (due to
historical reasons), so I might want to revert the change to
contrib/groff/FREEBSD-Xlist, but I have not decided it yet.


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru at FreeBSD.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040218/ed68da2a/attachment.bin