Date: 19 Apr 1998 13:33:38 +0200 From: Jacob Bohn Lorensen <jacob@jblhome.ping.dk> To: pb@fasterix.frmug.org (Pierre Beyssac) Cc: Matthew.Thyer@dsto.defence.gov.au (Matthew Thyer), joelh@gnu.org, c5666305@comp.polyu.edu.hk, current@FreeBSD.ORG Subject: Re: Using CVSUP and CTM together (Was Re: Disk munging problem with current solved) Message-ID: <87g1jaqc4t.fsf@pippin.jblhome.ping.dk> In-Reply-To: pb@fasterix.frmug.org's message of Thu, 19 Mar 1998 11:58:13 %2B0100 References: <199803171142.TAA07037@cssolar85.COMP.HKP.HK> <350E643D.A47CB903@camtech.net.au> <199803182240.QAA07391@detlev.UUCP> <35106C23.64774CD9@dsto.defence.gov.au> <199803190244.UAA08131@detlev.UUCP> <35108C62.DDFB1544@dsto.defence.gov.au> <19980319115813.MB01769@mars.hsc.fr>
next in thread | previous in thread | raw e-mail | index | archive | help
I am not a very knowledgeable cvs person, but I do run a different
setup (using ctm and cvs) which I think is quite nice.
pb@fasterix.frmug.org (Pierre Beyssac) writes:
> According to Matthew Thyer:
> > Also it would seem that CTM is not very useful for developers as
> > they are required to update their tree before committing changes
> > (in case what they were to change has been changed by others).
> With CTM there are at least two solutions, as far as I know:
> A) Receive the CVS tree via CTM. It's expensive (you have to
> B) Receive /usr/src via CTM. Update your tree locally, keep
> copies of the original files you modified. When CTM
> complains about a MD5 mismatch, copy the original file
> by adding a .ctm extension to it (CTM looks for these
C) Update /local/src via CTM. Never touch /local/src youself. Maintain
your own CVS repository by regularly checking in with
cd /local/src
cvs import -I \! -ko -m "FreeBSD Current" src SRC_CUR V<ctm-id>
Use -ko to keep the FreeBSD CVS version numbers in files. Make
/usr/src a checked-out copy of your local repository. Do your hacking
here.
This is expensive disk-wise in that you effectively have three on-line
copies of the sources: your local repository, your checked-out working
copy, and /local/src that ctm updates. However you get to use cvs to
help resolving conflicts.
I came up with this approch in order to start learning about CVS; I am
still learning, and occasionally have to blow away the repository and
start over because many CVS command does not do what I think they do.
Unfortunately, with this approach you don't get all the cvs log
messages, but the cvs-all mailing list makes up for this.
Jacob.
--
Jacob Lorensen; Mosebuen 33, 1.; DK-2820 Gentofte, Denmark; +45-31560401
PGP ID = E596F0B5; PGP Fingerprint = 1E8726467436DC4A 723B6678C5AD9E71
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87g1jaqc4t.fsf>