Date: Tue, 21 Sep 1999 20:03:49 +0800 From: Peter Wemm <peter@netplex.com.au> To: Mark Murray <mark@grondar.za> Cc: Sheldon Hearn <sheldonh@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/tcp_wrappers hosts_access.5 hosts_access.c tcpdchk.c Message-ID: <19990921120349.2D5ED1CA7@overcee.netplex.com.au> In-Reply-To: Your message of "Tue, 21 Sep 1999 13:39:51 %2B0200." <199909211139.NAA71960@gratis.grondar.za>
next in thread | previous in thread | raw e-mail | index | archive | help
Mark Murray wrote:
> > Is this an official patch that will be in future releases? If so there is
> > a better way to do this (ie: a commit to the vendor branch) that doesn't hu
rt
> > the repo like this.
>
> Durn. My well-thumbed CVS FAQ (admittedly old) say that patches _shouldnt_
> be appied to vendor brances, only develpment branches. Sigh. I'll ammend.
Depends on the origin, eg: vendor versus local and whether it's going to be
in future vendor releases. For example, if we get an incremental patch for
a vendor release that will be in a future release (or will be handled
differently), then doing it on the vendor branch is the right thing to do.
Otherwise, if we take it as a local patch, then we have to merge it forever
after imports, even if it ends up that the mainline is identical to the
future vendor releases. Committing something to a vendor branch is
seriously black magic and not to be done lightly. We've done this with
sendmail a few times and it works well.
It's eqivalent to (say) doing this:
extract tcp_wrappers dist
apply patch
cvs import src/contrib/tcpwrappers v7_6_blacklistpatch
The result is the same, depending on whether you want intermediate tags.
If not, then the main difference is that applying the patch means avoiding
touching a heap of files. Manually adding the tag does have the same final
result. eg:
cvs up -rFOO tcpwrappers
apply patch
cvs commit -m 'apply vendor patch for blacklist' (for example)
cvs tag -rFOO v7_6_blacklistpatch
... and the result is identical. In fact, this is pretty much what
cvs import does.
If anybody wants to do something like this for contrib stuff (ie: apply a
between-release vendor patch), please speak to me first, or use the
"extract distfile; apply patch; cvs import ...vx_y_interim" method.
Cheers,
-Peter
--
Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au
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?19990921120349.2D5ED1CA7>