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 Wed, Feb 18, 2004 at 11:37:00AM -0800, Nate Lawson wrote:
> On Wed, 18 Feb 2004, Ruslan Ermilov wrote:
> > On Wed, Feb 18, 2004 at 09:52:55AM -0800, Nate Lawson wrote:
[...]
> > > This is not the appropriate way to do it.  des@, roberto@, and myself
> > > have all explained this both times this has happened.
> >
> > I know, I just happen to have a different opinion on this subject.
> >
> > Removing files on a vendor branch, OTOH, implies that these files
> > were removed by the vendor, which it's NOT.
> 
> I consider the vendor branch to contain unmodified copies of files from
> the vendor distribution but not necessarily the entire distribution.
> There are numerous files (i.e. doc/*) which just don't belong in the tree.
> But I can see your point on this.
> 
> > Of course one could argue that we should also put getopt.h
> > into FREEBSD-Xlist, so that the next import won't re-import
> > it again, but then it is not different from simply removing
> > it on HEAD -- there will be no conflict with future imports
> > using the same exclude file.
> 
> I disagree with this.  It IS different and not just in terms of future
> imports.
> 
But we actually differ from vendor, since vendor still uses
getopt.h, and we don't.

> cvs diff will show that the old file which is no longer present
> in HEAD is still around.
> 
Yes, but that's on purpose.  I like it for contrib/groff/ to know
that we have removed yacc(1) output files locally on HEAD, but
still have them on the vendor branch (it's useful in particular
to watch the differences in generated yacc(1) and lex(1) code).

> If it's going in Xlist, it should be deleted
> from the vendor branch.
> 
Yes, sure, the step #3 below takes care of that.

> > 3 (follows from #1) after a new import, both vendor branch
> >   and HEAD, in that order, should be cleared to remove files
> >   that were not imported (either vendor has removed them, or
> >   these files are in our exclude list) with the commit log
> >   such as "Removed files not present in the latest import".
> 
> This I also disagree with.  It's unnecessary repo-thrashing to import and
> then delete files immediately.
> 
You misunderstood me.  What I meant is that if file getopt.h
was previously imported on the FSF branch, and then we added
it to FREEBSD-Xlist, but postpone its removal until the next
import as I suggest, to keep the outputs from "cvs co -rFSF"
and "cvs co -rv_x_y" consistent, then after next import we
should remove it on FSF branch.  After that, locally modified
files (those on trunk), which are no longer needed should
also be removed from HEAD.  And this you seem to agree to.


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/b0d7d36f/attachment.bin