From owner-freebsd-current Tue Mar 19 08:25:21 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id IAA12527 for current-outgoing; Tue, 19 Mar 1996 08:25:21 -0800 (PST) Received: from halloran-eldar.lcs.mit.edu (halloran-eldar.lcs.mit.edu [18.26.0.159]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id IAA12520 for ; Tue, 19 Mar 1996 08:25:11 -0800 (PST) Received: by halloran-eldar.lcs.mit.edu; (5.65/1.1.8.2/19Aug95-0530PM) id AA32720; Tue, 19 Mar 1996 11:23:33 -0500 Date: Tue, 19 Mar 1996 11:23:33 -0500 From: "Garrett A. Wollman" Message-Id: <9603191623.AA32720@halloran-eldar.lcs.mit.edu> To: Greg Lehey Cc: current@FreeBSD.org (Users of FreeBSD -current) Subject: How to develop software and track current? In-Reply-To: <199603191049.LAA00676@nixpbe.pdb.sni.de> References: <199603191049.LAA00676@nixpbe.pdb.sni.de> Sender: owner-current@FreeBSD.org X-Loop: FreeBSD.org Precedence: bulk < said: > I'm currently about to start some active work on the ISDN software, > and I face a problem: I'm also tracking -current. How to I ensure > that I get my updates to -current and also maintain the modifications > I make to the ISDN software? 1) You make your modifications in a checked-out source tree, and sup the cvs tree. To integrate changes, use `cvs -q update -dP'. 2) You make your modifications in the source tree, and sup same. You keep a list of modified files, and a set of programs allow you to hide/unhide them from sup and determine when they need to be ftp'd to freefall to be merged. I don't have the disk space for (1), so I do (2). (I could probably /get/ the disk space, but it's more pain than I want to deal with right now.) (1) is a lot easier, /if/ you have the disk space. -GAWollman -- Garrett A. Wollman | Shashish is simple, it's discreet, it's brief. ... wollman@lcs.mit.edu | Shashish is the bonding of hearts in spite of distance. Opinions not those of| It is a bond more powerful than absence. We like people MIT, LCS, ANA, or NSA| who like Shashish. - Claude McKenzie + Florent Vollant