From owner-freebsd-hackers Tue May 28 13:40:59 2002 Delivered-To: freebsd-hackers@freebsd.org Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by hub.freebsd.org (Postfix) with ESMTP id 0CC9837B409 for ; Tue, 28 May 2002 13:40:08 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc03.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020528204007.LTYJ20219.sccrmhc03.attbi.com@InterJet.elischer.org>; Tue, 28 May 2002 20:40:07 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id NAA13224; Tue, 28 May 2002 13:25:35 -0700 (PDT) Date: Tue, 28 May 2002 13:25:34 -0700 (PDT) From: Julian Elischer To: Chris Knight Cc: freebsd-hackers@freebsd.org Subject: Re: Maintaining Large Patchsets Against FreeBSD In-Reply-To: <001101c20627$e70941f0$020aa8c0@aims.private> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG what is the patchset? It IS possible to set up a branch on your mirrored cvs repository using some magic branch numbers. john Polstra (jpd@freebsd.org) would be the person to ask if it can be done with a branch off a branch... (a magic branch off the 4.x branch) You may also be able to use P4 to import the 4.x branch into p4 and keep branch off that.. (but I couldn't tell you details) On Tue, 28 May 2002, Chris Knight wrote: > Howdy, > > I'm currently maintaining a largish (~4MB) patchset against FreeBSD 4.x > releases. Due to the nature of the patches, they'll never make it into the > FreeBSD tree. I currently maintain the patchset by checking out the previous > 4.x release, applying the patchset, doing a cvs update and resolving the > conflicts. I then add any additional patches and then cat up all the diffs > in the tree. > I was wondering if this was the most optimal way of maintaining the > patchset? The other approach I can see would be to create my own repository > and import the FreeBSD release code into my repository and then resolve the > conflicts. This would then give me better historical code management. > Any suggestions would be useful. > > Regards, > Chris Knight > Systems Administrator > AIMS Independent Computer Professionals > Tel: +61 3 6334 6664 Fax: +61 3 6331 7032 Mob: +61 419 528 795 > Web: http://www.aims.com.au > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-hackers" in the body of the message > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message