From owner-freebsd-current Sun Apr 19 04:40:47 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id EAA09067 for freebsd-current-outgoing; Sun, 19 Apr 1998 04:40:47 -0700 (PDT) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from mail.ic.dk (qmailr@mail.ic.dk [194.255.107.174]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id LAA09040 for ; Sun, 19 Apr 1998 11:40:40 GMT (envelope-from jacob@jblhome.ping.dk) Received: (qmail 11078 invoked from network); 19 Apr 1998 11:40:37 -0000 Received: from ic1.ic-local (HELO ic1.ic.dk) (192.168.65.12) by ic4.ic.dk with SMTP; 19 Apr 1998 11:40:37 -0000 Received: from jblhome by ic1.ic.dk with UUCP id AA09418 (5.65c8/IDA-1.4.4j); Sun, 19 Apr 1998 13:38:55 +0200 Received: (from jacob@localhost) by pippin.jblhome.ping.dk (8.8.8/8.8.8) id NAA28027; Sun, 19 Apr 1998 13:33:41 +0200 (CEST) (envelope-from jacob) 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) 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> From: Jacob Bohn Lorensen Date: 19 Apr 1998 13:33:38 +0200 In-Reply-To: pb@fasterix.frmug.org's message of Thu, 19 Mar 1998 11:58:13 +0100 Message-Id: <87g1jaqc4t.fsf@pippin.jblhome.ping.dk> Lines: 48 X-Mailer: Gnus v5.3/Emacs 19.34 X-Charset: ISO_8859-1 X-Char-Esc: 29 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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 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