From owner-freebsd-lite2 Mon Aug 19 04:50:54 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA08433 for lite2-outgoing; Mon, 19 Aug 1996 04:50:54 -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 EAA08428 for ; Mon, 19 Aug 1996 04:50:49 -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 TAA03563 for ; Mon, 19 Aug 1996 19:50:44 +0800 (WST) Message-Id: <199608191150.TAA03563@spinner.DIALix.COM> X-Mailer: exmh version 1.6.7 5/3/96 To: lite2@freebsd.org Subject: cvs tree preperation.. Date: Mon, 19 Aug 1996 19:50:44 +0800 From: Peter Wemm Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk This kind of got away from me last time, lets see if we can sort something out and get it going. As for how we do it, we have several choices.. I'll re-list them and add some answers to questions I was asked last time... 1: same as smp tree. -current imported onto vendor branch. This looses -current's commit history, all of -current is in a single revision, and logs cannot be extracted. The lite-2 patches are applied to it, and periodically a new -current is pulled in. Once the conflicts from -current are resolved, a 'cvs diff -c -rCURRENT' will produce a patch that will be able to be applied cleanly to -current. The disadvantages would be that to get deltas/logs between -current versions, you'd have to write a script that takes your $PWD and uses that to extract the info from another tree somewhere. 2: use cvsup to copy the -current tree into /home/lite2's repository, and ADD a side-branch that cvsup will not touch (hopefully). This means the commit logs are available in the working source. However, this has some serious disadvantages, this only works for a short time before it becomes impossible to manage. The basic problem is that from the branch-point onwards, cvs doesn't remember which parts of -current you've merged in. So, if you do a 'cvs update -j HEAD', it will merge -current's changes into the lite2 branch, and you resolve the conflicts. However, if you again, next week do a 'cvs update -jHEAD' you get BOTH weeks changes merged together into the side branch. This means you get all the same conflicts AGAIN, plus new ones. cvs uses rcsmerge, and as this branchpoint-to-current delta gets bigger, the conflicts will get bigger (ie: 50 line conflict markers because of a whitespace change is not fun). 3: like #2, but place explicit markers on the current branch and use those for merging, instead of 'update -j HEAD', we import -current, do a 'cvs rtag MERGE1', and on the lite2 branch, we do a 'cvs update -jMERGE1'. Next time we sync with -current, we add 'cvs rtag MERGE2' and do a 'cvs update -jMERGE1 -jMERGE2'. That way we wont get super-conflicts and the same conflicts over and over again. I'm not sure how it would go in practice, I've never tried it befor. If somebody branches -current with the same $Id$ as the Lite2 branch is on, we're sunk. 4: Give p3 a shot (http://www.p3.com). P3 is designed to do this sort of merging, but it's quite different to cvs and will take a lot of re-learning. It isn't quite as flexible with diffing, but it can be done. It can do delta-by-delta merging, rather than simply merging the lot and fixing up the mess. However, what we gained from the better branch support we'd probably loose in re-learning time.... My thoughts are that #1 is preferable from a "known quantity" perspective, but #3 is probably more practical but at a risk of using a new tool (ie: using cvsup to generate the repository on freefall, from freefall). Doug? Jeff? -Peter From owner-freebsd-lite2 Mon Aug 19 04:52:58 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA08670 for lite2-outgoing; Mon, 19 Aug 1996 04:52:58 -0700 (PDT) Received: from freefall.freebsd.org (localhost.cdrom.com [127.0.0.1]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id EAA08665 for ; Mon, 19 Aug 1996 04:52:57 -0700 (PDT) To: lite2 Subject: cvs tree MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <8662.840455576.1@freefall.freebsd.org> Date: Mon, 19 Aug 1996 04:52:56 -0700 Message-ID: <8663.840455576@freefall.freebsd.org> From: Poul-Henning Kamp Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Peter listed various choices. There's one more, that core will probably sanction in the next couple of days: import the entire boatload into -current and get it over with. same for smp btw. Poul-Henning From owner-freebsd-lite2 Mon Aug 19 05:15:53 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id FAA10254 for lite2-outgoing; Mon, 19 Aug 1996 05:15:53 -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 FAA10249; Mon, 19 Aug 1996 05:15:48 -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 UAA03679; Mon, 19 Aug 1996 20:15:43 +0800 (WST) Message-Id: <199608191215.UAA03679@spinner.DIALix.COM> X-Mailer: exmh version 1.6.7 5/3/96 To: Poul-Henning Kamp cc: lite2@freefall.freebsd.org Subject: Re: cvs tree In-reply-to: Your message of "Mon, 19 Aug 1996 04:52:56 MST." <8663.840455576@freefall.freebsd.org> Date: Mon, 19 Aug 1996 20:15:43 +0800 From: Peter Wemm Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Poul-Henning Kamp wrote: > Peter listed various choices. > > There's one more, that core will probably sanction in the next couple of days : > import the entire boatload into -current and get it over with. I dont know that it's actually ready to do that, is it? Last I heard, it was a large patch relative to an older -current, and needs a fair bit of work to bring it up to date, as well it needed the NFS merge. As far as I remember, that's what the lite2 scratch tree was for, to let Doug and Jeff merge their two parts together so that it can be integrated into -current without leaving the tree without NFS for a week or so. But still, I'm in favour of getting into the main tree asap once it kinda works. We have to give the public a fair bit of warning that we're going to do this I think. > same for smp btw. Yeah, the SMP stuff is largely #ifdef, so it's nowhere as big a deal as lite2. The smp stuff is on the fringe of the kernel, the lite2 code goes to the heart of it. > Poul-Henning Cheers, -Peter From owner-freebsd-lite2 Mon Aug 19 05:20:17 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id FAA10477 for lite2-outgoing; Mon, 19 Aug 1996 05:20:17 -0700 (PDT) Received: from critter.tfs.com ([140.145.230.252]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id FAA10469 for ; Mon, 19 Aug 1996 05:20:15 -0700 (PDT) Received: from critter.tfs.com (localhost.tfs.com [127.0.0.1]) by critter.tfs.com (8.7.5/8.7.3) with ESMTP id OAA08146 for ; Mon, 19 Aug 1996 14:19:45 +0200 (MET DST) To: lite2@freefall.freebsd.org Subject: Re: cvs tree In-reply-to: Your message of "Mon, 19 Aug 1996 20:15:43 +0800." <199608191215.UAA03679@spinner.DIALix.COM> Date: Mon, 19 Aug 1996 14:19:42 +0200 Message-ID: <8144.840457182@critter.tfs.com> From: Poul-Henning Kamp Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk In message <199608191215.UAA03679@spinner.DIALix.COM>, Peter Wemm writes: >> import the entire boatload into -current and get it over with. > >I dont know that it's actually ready to do that, is it? Last I heard, it >was a large patch relative to an older -current, and needs a fair bit of >work to bring it up to date, as well it needed the NFS merge. As far as I >remember, that's what the lite2 scratch tree was for, to let Doug and Jeff >merge their two parts together so that it can be integrated into -current >without leaving the tree without NFS for a week or so. if that is the only casualty, the choice seems easy to me.. >> same for smp btw. > >Yeah, the SMP stuff is largely #ifdef, so it's nowhere as big a deal as >lite2. The smp stuff is on the fringe of the kernel, the lite2 code goes >to the heart of it. So can I finally expect to see it happen ? :-) -- Poul-Henning Kamp | phk@FreeBSD.ORG FreeBSD Core-team. http://www.freebsd.org/~phk | phk@login.dknet.dk Private mailbox. whois: [PHK] | phk@ref.tfs.com TRW Financial Systems, Inc. Future will arrive by its own means, progress not so. From owner-freebsd-lite2 Mon Aug 19 09:07:41 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id JAA01688 for lite2-outgoing; Mon, 19 Aug 1996 09:07:41 -0700 (PDT) Received: from minnow.render.com (render.demon.co.uk [158.152.30.118]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id JAA01661; Mon, 19 Aug 1996 09:07:29 -0700 (PDT) Received: from minnow.render.com (minnow.render.com [193.195.178.1]) by minnow.render.com (8.6.12/8.6.9) with SMTP id RAA09257; Mon, 19 Aug 1996 17:04:10 +0100 Date: Mon, 19 Aug 1996 17:04:09 +0100 (BST) From: Doug Rabson To: Peter Wemm cc: Poul-Henning Kamp , lite2@freefall.freebsd.org Subject: Re: cvs tree In-Reply-To: <199608191215.UAA03679@spinner.DIALix.COM> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk On Mon, 19 Aug 1996, Peter Wemm wrote: > Poul-Henning Kamp wrote: > > Peter listed various choices. > > > > There's one more, that core will probably sanction in the next couple of days > : > > import the entire boatload into -current and get it over with. > > I dont know that it's actually ready to do that, is it? Last I heard, it > was a large patch relative to an older -current, and needs a fair bit of > work to bring it up to date, as well it needed the NFS merge. As far as I > remember, that's what the lite2 scratch tree was for, to let Doug and Jeff > merge their two parts together so that it can be integrated into -current > without leaving the tree without NFS for a week or so. I have a first cut of the NFS for lite2. I need a set of lite2 patches to be able to test it though. I am willing to work in a current tree which has had a lite2 mega patch applied to it to get this working. -- Doug Rabson, Microsoft RenderMorphics Ltd. Mail: dfr@render.com Phone: +44 171 734 3761 FAX: +44 171 734 6426 From owner-freebsd-lite2 Mon Aug 19 12:20:09 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA02689 for lite2-outgoing; Mon, 19 Aug 1996 12:20:09 -0700 (PDT) Received: (from hsu@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA02683; Mon, 19 Aug 1996 12:20:07 -0700 (PDT) Date: Mon, 19 Aug 1996 12:20:07 -0700 (PDT) From: Jeffrey Hsu Message-Id: <199608191920.MAA02683@freefall.freebsd.org> To: peter Subject: Re: cvs tree preperation.. Cc: lite2 Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > 3: like #2, but place explicit markers on the current branch and use those > 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. From owner-freebsd-lite2 Mon Aug 19 12:22:36 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA03041 for lite2-outgoing; Mon, 19 Aug 1996 12:22:36 -0700 (PDT) Received: (from hsu@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA03031; Mon, 19 Aug 1996 12:22:34 -0700 (PDT) Date: Mon, 19 Aug 1996 12:22:34 -0700 (PDT) From: Jeffrey Hsu Message-Id: <199608191922.MAA03031@freefall.freebsd.org> To: dfr@render.com Subject: Re: cvs tree Cc: lite2 Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > I need a set of lite2 patches to be able to test it though You can find a lite2 patch relative to -current as of a few minutes ago in ~hsu/cvs/diff.8-19. From owner-freebsd-lite2 Mon Aug 19 12:28:20 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA03859 for lite2-outgoing; Mon, 19 Aug 1996 12:28:20 -0700 (PDT) Received: (from hsu@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA03851; Mon, 19 Aug 1996 12:28:18 -0700 (PDT) Date: Mon, 19 Aug 1996 12:28:18 -0700 (PDT) From: Jeffrey Hsu Message-Id: <199608191928.MAA03851@freefall.freebsd.org> To: phk Subject: Re: cvs tree Cc: lite2 Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > it was a large patch relative to an older -current, and needs a fair bit of > work to bring it up to date, as well it needed the NFS merge > As far as I remember, that's what the lite2 scratch tree was for I've brought it up to -current and would have done a NFS merge if I had another machine to test NFS against. Fortunately, Doug has come to the rescue here. The problem is that this is too large of a change to put into -current to run, test, and debug there. So I ws hoping that I could get more people to take a look at it if there was a tree for them to sup and work off without having to inflict instability on -current, even though that's what -current is nominally for. From owner-freebsd-lite2 Tue Aug 20 01:41:15 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id BAA10309 for lite2-outgoing; Tue, 20 Aug 1996 01:41:15 -0700 (PDT) Received: from parkplace.cet.co.jp (parkplace.cet.co.jp [202.32.64.1]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id BAA10297; Tue, 20 Aug 1996 01:41:11 -0700 (PDT) Received: from localhost (michaelh@localhost) by parkplace.cet.co.jp (8.7.5/CET-v2.1) with SMTP id IAA22244; Tue, 20 Aug 1996 08:41:08 GMT Date: Tue, 20 Aug 1996 17:41:08 +0900 (JST) From: Michael Hancock To: Jeffrey Hsu cc: peter@freefall.freebsd.org, lite2@freefall.freebsd.org Subject: Re: cvs tree preperation.. In-Reply-To: <199608191920.MAA02683@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk 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 those > > 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. From owner-freebsd-lite2 Tue Aug 20 03:39:42 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA17673 for lite2-outgoing; Tue, 20 Aug 1996 03:39:42 -0700 (PDT) Received: from minnow.render.com (render.demon.co.uk [158.152.30.118]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id DAA17652; Tue, 20 Aug 1996 03:39:37 -0700 (PDT) Received: from minnow.render.com (minnow.render.com [193.195.178.1]) by minnow.render.com (8.6.12/8.6.9) with SMTP id LAA12142; Tue, 20 Aug 1996 11:39:11 +0100 Date: Tue, 20 Aug 1996 11:39:10 +0100 (BST) From: Doug Rabson To: Jeffrey Hsu cc: lite2@freefall.freebsd.org Subject: Re: cvs tree In-Reply-To: <199608191922.MAA03031@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk On Mon, 19 Aug 1996, Jeffrey Hsu wrote: > > I need a set of lite2 patches to be able to test it though > > You can find a lite2 patch relative to -current as of a few minutes ago > in ~hsu/cvs/diff.8-19. > I got the diff and applied it to current (with a couple of minor tweaks). I have a couple of problems with it though. It seems that bdevsw and cdevsw both have a new field d_type which is not initialised by most of the static initialisers in various devices across the kernel. What does this field do? It doesn't seem to be used anywhere. After hacking various devices which my kernel config included, I got something which booted but now for some reason, my two non-root ffs filesystems /usr and /var get mounted readonly which makes it hard to boot cleanly :-). I can't figure out what is wrong here. If I type 'mount -u -o rw /usr' then it makes the fs read-write but if I use 'umount /usr; mount /usr' it is read-only. Wierd. -- Doug Rabson, Microsoft RenderMorphics Ltd. Mail: dfr@render.com Phone: +44 171 734 3761 FAX: +44 171 734 6426 From owner-freebsd-lite2 Tue Aug 20 06:33:37 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id GAA28841 for lite2-outgoing; Tue, 20 Aug 1996 06:33:37 -0700 (PDT) Received: from critter.tfs.com ([140.145.230.177]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id GAA28821; Tue, 20 Aug 1996 06:33:33 -0700 (PDT) Received: from critter.tfs.com (localhost.tfs.com [127.0.0.1]) by critter.tfs.com (8.7.5/8.7.3) with ESMTP id VAA07864; Mon, 19 Aug 1996 21:46:56 +0200 (MET DST) To: Jeffrey Hsu cc: lite2@freebsd.org Subject: Re: cvs tree In-reply-to: Your message of "Mon, 19 Aug 1996 12:28:18 PDT." <199608191928.MAA03851@freefall.freebsd.org> Date: Mon, 19 Aug 1996 21:46:56 +0200 Message-ID: <7859.840484016@critter.tfs.com> From: Poul-Henning Kamp Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk In message <199608191928.MAA03851@freefall.freebsd.org>, Jeffrey Hsu writes: > >The problem is that this is too large of a change to put into -current >to run, test, and debug there. So I ws hoping that I could get more >people to take a look at it if there was a tree for them to sup and >work off without having to inflict instability on -current, even though >that's what -current is nominally for. I think that we have to realize that one cannot be a little bit pregnant and just go for it. Few if any of us would have the time to play with the stuff if it's in a separate tree. If it gets put into -current, then we'll bloddy have to run it :-) Remember a lot of things have been put on "hold until lite2 is in" and I don't think that is really a good thing to extend that hold. So, if you can boot your code, and it generally holds up for more than 20 minutes between panics, commit it, and life will go on albeit a little bit bumpy for the next couple of days/weeks. Should peter want to put a tag right before the import, just in case, I'm not against it, but waiting doesn't work. We've been there, done that, and it just never stops! -- Poul-Henning Kamp | phk@FreeBSD.ORG FreeBSD Core-team. http://www.freebsd.org/~phk | phk@login.dknet.dk Private mailbox. whois: [PHK] | phk@ref.tfs.com TRW Financial Systems, Inc. Future will arrive by its own means, progress not so. From owner-freebsd-lite2 Tue Aug 20 07:54:14 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id HAA04295 for lite2-outgoing; Tue, 20 Aug 1996 07:54:14 -0700 (PDT) Received: from minnow.render.com (render.demon.co.uk [158.152.30.118]) by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id HAA04280; Tue, 20 Aug 1996 07:54:08 -0700 (PDT) Received: from minnow.render.com (minnow.render.com [193.195.178.1]) by minnow.render.com (8.6.12/8.6.9) with SMTP id PAA12502; Tue, 20 Aug 1996 15:53:16 +0100 Date: Tue, 20 Aug 1996 15:53:14 +0100 (BST) From: Doug Rabson To: Poul-Henning Kamp cc: Jeffrey Hsu , lite2@freebsd.org Subject: Re: cvs tree In-Reply-To: <7859.840484016@critter.tfs.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk On Mon, 19 Aug 1996, Poul-Henning Kamp wrote: > In message <199608191928.MAA03851@freefall.freebsd.org>, Jeffrey Hsu writes: > > > >The problem is that this is too large of a change to put into -current > >to run, test, and debug there. So I ws hoping that I could get more > >people to take a look at it if there was a tree for them to sup and > >work off without having to inflict instability on -current, even though > >that's what -current is nominally for. > > I think that we have to realize that one cannot be a little bit pregnant > and just go for it. Few if any of us would have the time to play with > the stuff if it's in a separate tree. > > If it gets put into -current, then we'll bloddy have to run it :-) > > Remember a lot of things have been put on "hold until lite2 is in" and > I don't think that is really a good thing to extend that hold. > > So, if you can boot your code, and it generally holds up for more than > 20 minutes between panics, commit it, and life will go on albeit a little > bit bumpy for the next couple of days/weeks. > > Should peter want to put a tag right before the import, just in case, > I'm not against it, but waiting doesn't work. We've been there, done > that, and it just never stops! I more or less agree with Poul apart from the fact that not all of the filesystems have been converted. In Jeffrey's recent patch set, it appears that devfs, cd9660, msdosfs and nfs all still need the merge. I couldn't get procfs to work either although it did compile. There seem to be a couple of issues with changes to the cdevdw and bdevdw structures as well which affects a lot of drivers. -- Doug Rabson, Microsoft RenderMorphics Ltd. Mail: dfr@render.com Phone: +44 171 734 3761 FAX: +44 171 734 6426 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 From owner-freebsd-lite2 Tue Aug 20 17:49:59 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA21302 for lite2-outgoing; Tue, 20 Aug 1996 17:49:59 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA21286 for freebsd-lite2; Tue, 20 Aug 1996 17:49:57 -0700 (PDT) Date: Tue, 20 Aug 1996 17:49:57 -0700 (PDT) From: Peter Wemm Message-Id: <199608210049.RAA21286@freefall.freebsd.org> To: freebsd-lite2 Subject: cvs commit: CVSROOT modules Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/08/20 17:49:57 Modified: . modules Log: now that mkmodules is not used anymore on freefall, dont call it. Revision Changes Path 1.4 +1 -12 CVSROOT/modules From owner-freebsd-lite2 Tue Aug 20 19:04:45 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA26004 for lite2-outgoing; Tue, 20 Aug 1996 19:04:45 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA25982 for freebsd-lite2; Tue, 20 Aug 1996 19:04:40 -0700 (PDT) Date: Tue, 20 Aug 1996 19:04:40 -0700 (PDT) From: Peter Wemm Message-Id: <199608210204.TAA25982@freefall.freebsd.org> To: freebsd-lite2 Subject: cvs commit: CVSROOT log_accum.pl Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/08/20 19:04:38 Modified: . log_accum.pl Log: make logs go to commitlogs/sys instead of commitlogs/other Revision Changes Path 1.3 +3 -1 CVSROOT/log_accum.pl From owner-freebsd-lite2 Tue Aug 20 19:09:19 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA26606 for lite2-outgoing; Tue, 20 Aug 1996 19:09:19 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA26583 for freebsd-lite2; Tue, 20 Aug 1996 19:09:17 -0700 (PDT) Date: Tue, 20 Aug 1996 19:09:17 -0700 (PDT) From: Peter Wemm Message-Id: <199608210209.TAA26583@freefall.freebsd.org> To: freebsd-lite2 Subject: cvs commit: CVSROOT modules Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/08/20 19:09:15 Modified: . modules Log: update modules, cvsup put the sys files under src/sys not sys like I was expecting... Revision Changes Path 1.5 +55 -55 CVSROOT/modules