From owner-freebsd-questions Wed Mar 5 20:27:29 2003 Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E395137B401 for ; Wed, 5 Mar 2003 20:27:26 -0800 (PST) Received: from p6m7g8.com (pcp02835904pcs.hyatsv01.md.comcast.net [68.54.254.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB38343F3F for ; Wed, 5 Mar 2003 20:27:25 -0800 (PST) (envelope-from philip@p6m7g8.com) Received: from p6m7g8.com (localhost [127.0.0.1]) by p6m7g8.com (8.12.6/8.12.7) with ESMTP id h25NRRY9085800; Wed, 5 Mar 2003 23:27:27 GMT (envelope-from philip@p6m7g8.com) Received: by p6m7g8.com (8.12.6/8.12.7/Submit) id h25NRQNX085793; Wed, 5 Mar 2003 23:27:26 GMT Content-Type: text/plain; charset="us-ascii" From: "Philip M. Gollucci" Organization: eJournalPress To: info-cvs@gnu.org Subject: MFC'ing Date: Wed, 5 Mar 2003 23:27:21 +0000 User-Agent: KMail/1.4.3 Cc: questions@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200303052327.21813.philip@p6m7g8.com> Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Thanks in advanced. Sorry for the crosspost, but I know some of you FreeB= SD=20 developers do this all the time. Note the naming scheme ... wink wink. Okay fine, so I couldn't resit the developer like apache cvs tags :) say I have branches: RELENG_1(stable/prod), RELENG_2(release/qa), HEAD(current/devel= ) branch point tags: RELENG_1_BP, RELENG_2_BP tags: p6_RELENG_1_0_PRE1, p6_RELENG_1_0_PRE2, RELENG_1_0, RELENG_1_1_PRE1= =20 p6_RELENG_1_1, RELENG_2_0 eventually equivalents for RELENG_3 will be created from HEAD and support= for=20 RELENG_1 dropped. now say my respository has 4 files file1.pm file2.pm dir2/file3.pm dir1/file4.pm I change the last 3 on HEAD. Now a week later I want to MFC these change= s and=20 only these changes from HEAD to RELENG_2 branch. One of the big problems = I=20 have here is say that during the previously mentioned week, I change file= 1.pm=20 and dir/file4.pm. I only want the initial changes MFC'ed as I have not h= ad a=20 "burn in" period long enough to move the back from the devel branch (HEAD= ) to=20 our qa branch(RELENG_2). I think I have to add more tags to the tree to d= o=20 this, but I am not sure. Please don't confuse this with wanting to merge branches into the trunk. = That=20 I know how do and it is not what I want. =46rom FreeBSD, theres how we MCF new files. How do we change this to MFC multiples that already exist ? % cd sys/alpha/include % cvs update -rRELENG_4 cvs update: Updating . U clockvar.h U console.h ... % cvs update -kk -Ap smp.h > smp.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Checking out smp.h RCS: /usr/cvs/src/sys/alpha/include/smp.h,v VERS: 1.1 *************** % cvs add smp.h cvs add: scheduling file `smp.h' for addition on branch `RELENG_4' cvs add: use 'cvs commit' to add this file permanently % cvs commit --=20 END=20 -------------------------------------------------------------------------= -----=20 Philip M. Gollucci philip@p6m7g8.com 301.474.9294 301.646.3011 (cell)=20 Science, Discovery, & the Universe (UMCP)=20 Webmaster & Webship Teacher=20 URL: http://www.sdu.umd.edu=20 eJournalPress=20 Database/PERL Programmer & System Admin=20 URL : http://www.ejournalpress.com=20 Resume : http://p6m7g8.net/Resume=20 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message