From owner-freebsd-hackers Tue May 28 2:14:16 2002 Delivered-To: freebsd-hackers@freebsd.org Received: from postoffice.aims.com.au (eth0.lnk.aims.com.au [203.31.73.253]) by hub.freebsd.org (Postfix) with ESMTP id 6CFCE37B401 for ; Tue, 28 May 2002 02:14:10 -0700 (PDT) Received: from postoffice.aims.com.au (nts-ts1.aims.private [192.168.10.2]) by postoffice.aims.com.au with ESMTP id g4S9E8o92362 for ; Tue, 28 May 2002 19:14:08 +1000 (EST) (envelope-from chris@aims.com.au) Received: from ntsts1 by aims.com.au with SMTP (MDaemon.v3.5.3.R) for ; Tue, 28 May 2002 19:13:17 +1000 Reply-To: From: "Chris Knight" To: Subject: Maintaining Large Patchsets Against FreeBSD Date: Tue, 28 May 2002 19:13:12 +1000 Message-ID: <001101c20627$e70941f0$020aa8c0@aims.private> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook CWS, Build 9.0.2416 (9.0.2911.0) X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4807.1700 Importance: Normal X-Return-Path: chris@aims.com.au X-MDaemon-Deliver-To: freebsd-hackers@freebsd.org 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 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