Date: Sun, 29 Jun 1997 12:23:20 -0700 (PDT) From: "Jonathan M. Bresler" <jmb> To: pst@shockwave.com (Paul Traina) Cc: jmb@FreeBSD.ORG, steve@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/patch ChangeLog Makefile.in NEWS acconfig.h backupfile.c common.h config.hin configure configure.in Message-ID: <199706291923.MAA14164@hub.freebsd.org> In-Reply-To: <199706291852.LAA26110@precipice.shockwave.com> from "Paul Traina" at Jun 29, 97 11:52:53 am
next in thread | previous in thread | raw e-mail | index | archive | help
Paul, thanks for the explanation and detailed examples of how ot handle vendor branches. earlier this week i was considering how to bring in sendmail-8.8.6. while i was working on it, peter wemm beat me to it. good thing that he did! i could very well have made a mistake in doing so. jmb [quoted to provide documentation in the mailing list archive, and to serve as a quick lesson for anyone reading.] > The proper thing to do was to do: > > cvs import -m "Upgrade to patch 2.4" src/contrib/patch \ > FSF v2_4 > > on a virgin extraction of the FSF patch-2.4.tar.gz distribution. > Followed by: > > cd /tmp/somewhere > cvs co -jFSF:yesterday -jFSF contrib_patch > cd contrib_patch > > <fix up any conflicts> > > cvs commit -m "Resolve v2.4 import conflicts." > > to handle any conflicts between FreeBSD local changes and the new > version. > > The point is that in any software we import from a 3rd party, whether > it goes in contrib or not, changes from the vendor must be kept on the > vendor branch (in this example, FSF). > > This way, we can easily extract FreeBSD local changes at any point with > > cvs diff -c -rFSF > > and easily merge them over time.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706291923.MAA14164>