cvs commit: src/contrib/groff FREEBSD-Xlist src/contrib/groff/src/include getopt.h src/contrib/groff/src/libs/libgroff getopt.c getopt1.c

[Ruslan Ermilov]

On Thu, Feb 19, 2004 at 12:06:17PM +0300, Andrey Chernov wrote:
> On Thu, Feb 19, 2004 at 10:56:20AM +0200, Ruslan Ermilov wrote:
> > What Nate means is that now (e.g., for Groff) after you do the next
> > import, and do the checkout on the FSF branch, it will still contain
> > the getopt.h file, which it should not.
> 
> Why not? getopt* files still needed for non-current FreeBSD, so they must 
> present in the FSF branch and not removed from there.
> 
I think you're confused here.  When you remove getopt.h in FSF or
HEAD, it will still exist in other RELENG_* branches.

The reason to remove it on the FSF branch is because you've added
it to FREEBSD-Xlist, so it won't be imported next time, and "cvs
co -rFSF" after the next import will check out a possibly outdated
getopt.h file, if we don't remove it on FSF branch after a new
import.  If you didn't put it in FREEBSD-Xlist (which is one of
the options, too), it will continue to exist on the FSF branch,
will get new v_X_Y tags, so no need to remove it on FSF, but it
will cause conflicts on future imports that modify getopt.h.  I
personally think such conflicts are harmless.

> > Andrey, please DO NOT do anything on vendor branches of at least
> > Groff and Texinfo while we're discussing things, and didn't come
> > up to an agreement.  Pretty much please.
> 
> I already finish with getopt*. There was getopt* left in cvs and binutils,
> but they can't be replaced.
> 
I mean: don't "cvs rm" getopt* on vendor branches 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/20040219/a7ca90e9/attachment.bin