From owner-freebsd-lite2 Tue Aug 20 15:48:44 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id PAA09727 for lite2-outgoing; Tue, 20 Aug 1996 15:48:44 -0700 (PDT) Received: from spinner.DIALix.COM (root@spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id PAA09710; Tue, 20 Aug 1996 15:48:39 -0700 (PDT) Received: from spinner.DIALix.COM (peter@localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id GAA27976; Wed, 21 Aug 1996 06:48:24 +0800 (WST) Message-Id: <199608202248.GAA27976@spinner.DIALix.COM> X-Mailer: exmh version 1.6.7 5/3/96 To: Michael Hancock cc: Jeffrey Hsu , lite2@freefall.freebsd.org Subject: Re: cvs tree preperation.. In-reply-to: Your message of "Tue, 20 Aug 1996 17:41:08 +0900." Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Date: Wed, 21 Aug 1996 06:48:24 +0800 From: Peter Wemm Michael Hancock wrote: > My vote is for 3:. 4: looks very nice, but I think it's better to have > source. Though, I won't complain if 4 is chosen. > > On Mon, 19 Aug 1996, Jeffrey Hsu wrote: > > > > 3: like #2, but place explicit markers on the current branch and use th ose > > > for merging > > > > This is close to what I do locally. > > > > > 4: Give p3 a shot (http://www.p3.com). > > > > I'm game if it's okay with everyone else. I've always wanted to try > > out p3 and this will force me to do so. > > > > So, either 3 or 4 is okay with me. Now that I think about it some more, I dont know that I have the energy to get p3 operational for our use, so it looks like #3 it is (cvsup from main code into /home/lite2, with a private branch and added merge markers) Ok, it sounds like we have a plan. Unless I hear otherwise, I'll set this up after I've had breakfast in a few hours... Cheers, -Peter