Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jan 2001 08:06:29 +1100 (EST)
From:      Bruce Evans <bde@zeta.org.au>
To:        Archie Cobbs <archie@dellroad.org>
Cc:        John Baldwin <jhb@FreeBSD.org>, cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, kris@FreeBSD.org
Subject:   Re: cvs commit: src/contrib/tcpdump print-smb.c
Message-ID:  <Pine.BSF.4.21.0101250757530.48073-100000@besplex.bde.org>
In-Reply-To: <200101241726.JAA02576@curve.dellroad.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 24 Jan 2001, Archie Cobbs wrote:

> John Baldwin writes:
> > >> No. From now on, every new vendor release of that file will need to
> > >> have patches merged by hand.
> > > 
> > > By hand? The "cvs update -j .. -j .." or whatever that you do after
> > > an import should take care of all of the non-conflicting
> > > modifications
> > > for all of the files at once.  So there should be zero extra work
> > > caused by this change, unless I'm misunderstanding something (I'm
> > > not a CVS expert).
> > 
> > See the committers guide, it has a FAQ for this:
> > 
> > http://www.freebsd.org/tutorials/committers-guide/article.html
> 
> So from my reading of that, the only problem is the size of the
> repository file (and associated side effects on things like cvsup),
> not that anybody has to do any extra work... correct?

No.  The FAQ is a FWrongAnswer as usual.  No one cared much about disk
space even a few years ago when the FAQ was written.  The main problems
are:
- From now on, every new vendor release of that file will need to have
  patches merged by hand.
- From now on, every new vendor release of that file will need to have
  patches _verified_ by hand.
- -j doesn't work very well.  Ask obrien for horror stories.

Bruce



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0101250757530.48073-100000>