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

[Andrey Chernov]

On Thu, Feb 19, 2004 at 12:58:44PM +0200, Ruslan Ermilov wrote:
> I think you're confused here.  When you remove getopt.h in FSF or
> HEAD, it will still exist in other RELENG_* branches.

It doesn't matter, is it still exist in other RELENG_* branches, because
somebody checking out vendor branch not get whole picture after removing
from it, and those still exist in other branches will be lost from the
sight this way.

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

What I suggest to clarify this confusion is removing getopt* from
FREEBSD-Xlist's and put them into FREEBSD-deleted, see my other message
where FREEBSD-deleted role explained.

-- 
Andrey Chernov | http://ache.pp.ru/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 305 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040219/03dab27a/attachment.bin