From owner-cvs-bin Sun Feb 16 21:26:13 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id VAA24971 for cvs-bin-outgoing; Sun, 16 Feb 1997 21:26:13 -0800 (PST) Received: (from jkh@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id VAA24962; Sun, 16 Feb 1997 21:26:12 -0800 (PST) Date: Sun, 16 Feb 1997 21:26:12 -0800 (PST) From: "Jordan K. Hubbard" Message-Id: <199702170526.VAA24962@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/df df.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 97/02/16 21:26:11 Modified: bin/df df.c Log: Include . Revision Changes Path 1.12 +1 -0 src/bin/df/df.c From owner-cvs-bin Sun Feb 16 22:50:08 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id WAA27969 for cvs-bin-outgoing; Sun, 16 Feb 1997 22:50:08 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id WAA27894; Sun, 16 Feb 1997 22:48:19 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id RAA18321; Mon, 17 Feb 1997 17:43:43 +1100 Date: Mon, 17 Feb 1997 17:43:43 +1100 From: Bruce Evans Message-Id: <199702170643.RAA18321@godzilla.zeta.org.au> To: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df df.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > Modified: bin/df df.c > Log: > Include . Please do this right by importing Lite2 and merging the relevant parts. Bruce From owner-cvs-bin Mon Feb 17 00:10:24 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id AAA00762 for cvs-bin-outgoing; Mon, 17 Feb 1997 00:10:24 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id AAA00707; Mon, 17 Feb 1997 00:08:43 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.5/8.6.9) with ESMTP id AAA25952; Mon, 17 Feb 1997 00:08:36 -0800 (PST) To: Bruce Evans cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df df.c In-reply-to: Your message of "Mon, 17 Feb 1997 17:43:43 +1100." <199702170643.RAA18321@godzilla.zeta.org.au> Date: Mon, 17 Feb 1997 00:08:36 -0800 Message-ID: <25948.856166916@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > > Modified: bin/df df.c > > Log: > > Include . > > Please do this right by importing Lite2 and merging the relevant parts. Oh bleah. Vendor branch stuff. Can I just easy-import it with a vendor id of LITE2 or something and it'll DTRT? This has always been where my CVS knowledge gets fuzzy, and why I've never updated our version of GNU tar to 1.18 (I knew I'd have to do it as a contrib thing, and that'd involve branch hair :-). Jordan From owner-cvs-bin Mon Feb 17 00:49:16 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id AAA02369 for cvs-bin-outgoing; Mon, 17 Feb 1997 00:49:16 -0800 (PST) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id AAA02260; Mon, 17 Feb 1997 00:47:30 -0800 (PST) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.8.4/8.8.4) with ESMTP id QAA01085; Mon, 17 Feb 1997 16:46:57 +0800 (WST) Message-Id: <199702170846.QAA01085@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: "Jordan K. Hubbard" cc: Bruce Evans , cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df df.c In-reply-to: Your message of "Mon, 17 Feb 1997 00:08:36 PST." <25948.856166916@time.cdrom.com> Date: Mon, 17 Feb 1997 16:46:56 +0800 From: Peter Wemm Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk "Jordan K. Hubbard" wrote: > > > Modified: bin/df df.c > > > Log: > > > Include . > > > > Please do this right by importing Lite2 and merging the relevant parts. > > Oh bleah. Vendor branch stuff. Can I just easy-import it with a vendor > id of LITE2 or something and it'll DTRT? This has always been where > my CVS knowledge gets fuzzy, and why I've never updated our version > of GNU tar to 1.18 (I knew I'd have to do it as a contrib thing, and > that'd involve branch hair :-). I didn't see what happened last time I suggested it, but I think the best way to update the utilities to Lite2 is to import Lite2 for the entire userland, allowing the tree to break and then spend 2 weeks fixing the resulting chaos. > Jordan Cheers, -Peter From owner-cvs-bin Mon Feb 17 01:14:18 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id BAA03246 for cvs-bin-outgoing; Mon, 17 Feb 1997 01:14:18 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id BAA03193; Mon, 17 Feb 1997 01:12:36 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id UAA23349; Mon, 17 Feb 1997 20:08:39 +1100 Date: Mon, 17 Feb 1997 20:08:39 +1100 From: Bruce Evans Message-Id: <199702170908.UAA23349@godzilla.zeta.org.au> To: bde@zeta.org.au, jkh@time.cdrom.com Subject: Re: cvs commit: src/bin/df df.c Cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, jkh@freefall.freebsd.org Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >> Please do this right by importing Lite2 and merging the relevant parts. > >Oh bleah. Vendor branch stuff. Can I just easy-import it with a vendor >id of LITE2 or something and it'll DTRT? This has always been where >my CVS knowledge gets fuzzy, and why I've never updated our version Same here :-). I've only imported newfs for Lite2. `cvs import somewhere/newfs CSRG bsd_44_lite_2' seemed to work, except I got `somewhere' wrong the first time and put newfs in $CVSROOT. I think easy-import only handles new imports. Bruce From owner-cvs-bin Mon Feb 17 03:29:59 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09426 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:29:59 -0800 (PST) Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09418; Mon, 17 Feb 1997 03:29:56 -0800 (PST) Date: Mon, 17 Feb 1997 03:29:56 -0800 (PST) From: Bruce Evans Message-Id: <199702171129.DAA09418@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/df - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 97/02/17 03:29:56 src/bin/df - Imported sources Update of /home/ncvs/src/bin/df In directory freefall.freebsd.org:/c/bde/src/df Revision/Branch: 1.1.1 Log Message: Attempt to import Lite2's df. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 C src/bin/df/df.1 C src/bin/df/df.c C src/bin/df/Makefile 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/bin/df From owner-cvs-bin Mon Feb 17 03:32:08 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09562 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:32:08 -0800 (PST) Received: (from jkh@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09555; Mon, 17 Feb 1997 03:32:06 -0800 (PST) Date: Mon, 17 Feb 1997 03:32:06 -0800 (PST) From: "Jordan K. Hubbard" Message-Id: <199702171132.DAA09555@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/df - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 97/02/17 03:32:06 src/bin/df - Imported sources Update of /home/ncvs/src/bin/df In directory freefall.freebsd.org:/c/jkh/df Revision/Branch: 1.1.1 Log Message: Import the 4.4L2 df on a vendor branch, as suggested by Bruce. Obtained from: 4.4Lite2 Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/bin/df/df.1 U src/bin/df/df.c U src/bin/df/Makefile No conflicts created by this import From owner-cvs-bin Mon Feb 17 03:39:00 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA09961 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:39:00 -0800 (PST) Received: from root.com (implode.root.com [198.145.90.17]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA09956; Mon, 17 Feb 1997 03:38:55 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by root.com (8.7.6/8.6.5) with SMTP id DAA07963; Mon, 17 Feb 1997 03:39:39 -0800 (PST) Message-Id: <199702171139.DAA07963@root.com> X-Authentication-Warning: implode.root.com: Host localhost [127.0.0.1] didn't use HELO protocol To: "Jordan K. Hubbard" cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources In-reply-to: Your message of "Mon, 17 Feb 1997 03:32:06 PST." <199702171132.DAA09555@freefall.freebsd.org> From: David Greenman Reply-To: dg@root.com Date: Mon, 17 Feb 1997 03:39:39 -0800 Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >jkh 97/02/17 03:32:06 > > src/bin/df - Imported sources > Update of /home/ncvs/src/bin/df > In directory freefall.freebsd.org:/c/jkh/df > > Revision/Branch: 1.1.1 > > Log Message: > Import the 4.4L2 df on a vendor branch, as suggested by Bruce. > Obtained from: 4.4Lite2 > > Status: > > Vendor Tag: CSRG > Release Tags: bsd_44_lite_2 > > U src/bin/df/df.1 > U src/bin/df/df.c > U src/bin/df/Makefile Didn't Bruce just do this? -DG David Greenman Core-team/Principal Architect, The FreeBSD Project From owner-cvs-bin Mon Feb 17 03:56:09 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA10566 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:56:09 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA10518; Mon, 17 Feb 1997 03:54:35 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.5/8.6.9) with ESMTP id DAA00908; Mon, 17 Feb 1997 03:54:28 -0800 (PST) To: Bruce Evans cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df df.c In-reply-to: Your message of "Mon, 17 Feb 1997 20:08:39 +1100." <199702170908.UAA23349@godzilla.zeta.org.au> Date: Mon, 17 Feb 1997 03:54:28 -0800 Message-ID: <904.856180468@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > Same here :-). I've only imported newfs for Lite2. `cvs import > somewhere/newfs CSRG bsd_44_lite_2' seemed to work, except I got > `somewhere' wrong the first time and put newfs in $CVSROOT. I think > easy-import only handles new imports. Actually, I'm starting to agree with Peter. :-) I just checked in df on the CSRG vendor branch, less painful than expected, and I merged it into -current to preview the changes. I immediately find that all the typetab stuff has been changed to a makevfslist, found over with mount, and tada! Now I've gotta merge mount which will, in turn, also reference... And that's only for this one problem. I also notice dumplfs is now falling over, to no doubt be followed by more mutual dependant bits. Why don't we just break it all the way and be done with it? :-) Jordan From owner-cvs-bin Mon Feb 17 03:57:03 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA10606 for cvs-bin-outgoing; Mon, 17 Feb 1997 03:57:03 -0800 (PST) Received: from time.cdrom.com (time.cdrom.com [204.216.27.226]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA10601; Mon, 17 Feb 1997 03:56:57 -0800 (PST) Received: from time.cdrom.com (localhost [127.0.0.1]) by time.cdrom.com (8.8.5/8.6.9) with ESMTP id DAA00941; Mon, 17 Feb 1997 03:56:53 -0800 (PST) To: dg@root.com cc: "Jordan K. Hubbard" , CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources In-reply-to: Your message of "Mon, 17 Feb 1997 03:39:39 PST." <199702171139.DAA07963@root.com> Date: Mon, 17 Feb 1997 03:56:53 -0800 Message-ID: <937.856180613@time.cdrom.com> From: "Jordan K. Hubbard" Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > Didn't Bruce just do this? Date: Mon, 17 Feb 1997 03:29:56 -0800 (PST) From: Bruce Evans Message-Id: <199702171129.DAA09418@freefall.freebsd.org> To: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, ... Date: Mon, 17 Feb 1997 03:32:06 -0800 (PST) From: "Jordan K. Hubbard" Message-Id: <199702171132.DAA09555@freefall.freebsd.org> To: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, ... ARGH!! 3 minutes apart, Bruce and Jordan dive for the same ball. :-( Sorry, but email latency is higher than 3 minutes. OK, now what do we do? Jordan From owner-cvs-bin Mon Feb 17 04:13:51 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA11542 for cvs-bin-outgoing; Mon, 17 Feb 1997 04:13:51 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA11402; Mon, 17 Feb 1997 04:12:04 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id XAA28788; Mon, 17 Feb 1997 23:04:39 +1100 Date: Mon, 17 Feb 1997 23:04:39 +1100 From: Bruce Evans Message-Id: <199702171204.XAA28788@godzilla.zeta.org.au> To: dg@root.com, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources Cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >>jkh 97/02/17 03:32:06 >> >> src/bin/df - Imported sources >> Update of /home/ncvs/src/bin/df >> In directory freefall.freebsd.org:/c/jkh/df >> >> Revision/Branch: 1.1.1 >> >> Log Message: >> Import the 4.4L2 df on a vendor branch, as suggested by Bruce. >> Obtained from: 4.4Lite2 >> >> Status: >> >> Vendor Tag: CSRG >> Release Tags: bsd_44_lite_2 >> >> U src/bin/df/df.1 >> U src/bin/df/df.c >> U src/bin/df/Makefile > > Didn't Bruce just do this? I won by 130 seconds :-). Why did I get conflicts, and where did jhk's commit go? It makes some sense for the update to be null, but not for commit mail to be sent when the repository isn't changed. Steve already merged everything except the vfs changes. I won't merge any more until other parts of Lite2 are merged (df will become dependent on ../../sbin/mount). Bruce From owner-cvs-bin Mon Feb 17 04:31:24 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA12703 for cvs-bin-outgoing; Mon, 17 Feb 1997 04:31:24 -0800 (PST) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA12648; Mon, 17 Feb 1997 04:29:42 -0800 (PST) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.8.4/8.8.4) with ESMTP id UAA02153; Mon, 17 Feb 1997 20:29:06 +0800 (WST) Message-Id: <199702171229.UAA02153@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: Bruce Evans cc: dg@root.com, jkh@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources In-reply-to: Your message of "Mon, 17 Feb 1997 23:04:39 +1100." <199702171204.XAA28788@godzilla.zeta.org.au> Date: Mon, 17 Feb 1997 20:29:04 +0800 From: Peter Wemm Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Bruce Evans wrote: > >>jkh 97/02/17 03:32:06 > >> > >> src/bin/df - Imported sources > >> Update of /home/ncvs/src/bin/df > >> In directory freefall.freebsd.org:/c/jkh/df > >> > >> Revision/Branch: 1.1.1 > >> > >> Log Message: > >> Import the 4.4L2 df on a vendor branch, as suggested by Bruce. > >> Obtained from: 4.4Lite2 > >> > >> Status: > >> > >> Vendor Tag: CSRG > >> Release Tags: bsd_44_lite_2 > >> > >> U src/bin/df/df.1 > >> U src/bin/df/df.c > >> U src/bin/df/Makefile > > > > Didn't Bruce just do this? > > I won by 130 seconds :-). Why did I get conflicts, and where did jhk's > commit go? It makes some sense for the update to be null, but not for > commit mail to be sent when the repository isn't changed. Because the vendor branch wasn't changed the second time, it was a null import. The 1.1.1 was not changed. > Bruce Cheers, -Peter From owner-cvs-bin Mon Feb 17 04:55:00 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id EAA13402 for cvs-bin-outgoing; Mon, 17 Feb 1997 04:55:00 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA13367; Mon, 17 Feb 1997 04:53:15 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id XAA29938; Mon, 17 Feb 1997 23:49:32 +1100 Date: Mon, 17 Feb 1997 23:49:32 +1100 From: Bruce Evans Message-Id: <199702171249.XAA29938@godzilla.zeta.org.au> To: bde@zeta.org.au, peter@spinner.DIALix.COM Subject: Re: cvs commit: src/bin/df - Imported sources Cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, dg@root.com, jkh@freefall.freebsd.org Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >> I won by 130 seconds :-). Why did I get conflicts, and where did jhk's >> commit go? It makes some sense for the update to be null, but not for >> commit mail to be sent when the repository isn't changed. > >Because the vendor branch wasn't changed the second time, it was a null >import. The 1.1.1 was not changed. And the pre-commit check is only done for commits? I merged the sources carefully (see ~bde/src/df) but won't commit the changes until later. Bruce From owner-cvs-bin Mon Feb 17 05:06:33 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA13781 for cvs-bin-outgoing; Mon, 17 Feb 1997 05:06:33 -0800 (PST) Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA13774; Mon, 17 Feb 1997 05:06:32 -0800 (PST) Date: Mon, 17 Feb 1997 05:06:32 -0800 (PST) From: Bruce Evans Message-Id: <199702171306.FAA13774@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/dumplfs - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 97/02/17 05:06:31 src/bin/dumplfs - Imported sources Update of /home/ncvs/src/bin/dumplfs In directory freefall.freebsd.org:/c/bde/src/dumplfs Revision/Branch: 1.1.1 Log Message: Import Lite2's dumplfs. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 N src/bin/dumplfs/dumplfs.8 N src/bin/dumplfs/dumplfs.c N src/bin/dumplfs/extern.h N src/bin/dumplfs/Makefile N src/bin/dumplfs/misc.c No conflicts created by this import From owner-cvs-bin Mon Feb 17 05:22:36 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA14584 for cvs-bin-outgoing; Mon, 17 Feb 1997 05:22:36 -0800 (PST) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id FAA14501; Mon, 17 Feb 1997 05:20:55 -0800 (PST) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.8.4/8.8.4) with ESMTP id VAA02443; Mon, 17 Feb 1997 21:20:39 +0800 (WST) Message-Id: <199702171320.VAA02443@spinner.DIALix.COM> X-Mailer: exmh version 2.0gamma 1/27/96 To: Bruce Evans cc: cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, dg@root.com, jkh@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df - Imported sources In-reply-to: Your message of "Mon, 17 Feb 1997 23:49:32 +1100." <199702171249.XAA29938@godzilla.zeta.org.au> Date: Mon, 17 Feb 1997 21:20:37 +0800 From: Peter Wemm Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Bruce Evans wrote: > >> I won by 130 seconds :-). Why did I get conflicts, and where did jhk's > >> commit go? It makes some sense for the update to be null, but not for > >> commit mail to be sent when the repository isn't changed. > > > >Because the vendor branch wasn't changed the second time, it was a null > >import. The 1.1.1 was not changed. > > And the pre-commit check is only done for commits? You mean the check for 3rd party commits? Yeah, that only has meaning for 'cvs commit' since 'cvs import' runs from a foreign tree that has not been checked out... There's no local version numbers or known timestamps (see CVS/Entries*) to compare. Anyway, the import was harmless, as near as I can tell, the files were not changed (no rcs log since there was no new 1.1.1.x version created). The only side effect was that an import message was mailed. > I merged the sources carefully (see ~bde/src/df) but won't commit the > changes until later. I suspect there is going to be quite a bit of cascading.. > Bruce Cheers, -Peter From owner-cvs-bin Mon Feb 17 05:38:18 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA15808 for cvs-bin-outgoing; Mon, 17 Feb 1997 05:38:18 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id FAA15721; Mon, 17 Feb 1997 05:36:37 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id AAA31015; Tue, 18 Feb 1997 00:34:43 +1100 Date: Tue, 18 Feb 1997 00:34:43 +1100 From: Bruce Evans Message-Id: <199702171334.AAA31015@godzilla.zeta.org.au> To: bde@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/dumplfs - Imported sources Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >bde 97/02/17 05:06:31 > > src/bin/dumplfs - Imported sources ^^^ > Update of /home/ncvs/src/bin/dumplfs > In directory freefall.freebsd.org:/c/bde/src/dumplfs > > Revision/Branch: 1.1.1 > > Log Message: > Import Lite2's dumplfs. Oops. Please remove this at some time when it can't hurt ctm or *sup. When is that? Bruce From owner-cvs-bin Mon Feb 17 07:05:55 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA20007 for cvs-bin-outgoing; Mon, 17 Feb 1997 07:05:55 -0800 (PST) Received: (from mpp@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id HAA19962; Mon, 17 Feb 1997 07:05:23 -0800 (PST) From: Mike Pritchard Message-Id: <199702171505.HAA19962@freefall.freebsd.org> Subject: Re: cvs commit: src/bin/df df.c To: peter@spinner.dialix.com (Peter Wemm) Date: Mon, 17 Feb 1997 07:05:23 -0800 (PST) Cc: jkh@time.cdrom.com, bde@zeta.org.au, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org In-Reply-To: <199702170846.QAA01085@spinner.DIALix.COM> from "Peter Wemm" at Feb 17, 97 04:46:56 pm X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Peter Wemm wrote: > > I didn't see what happened last time I suggested it, but I think the best > way to update the utilities to Lite2 is to import Lite2 for the entire > userland, allowing the tree to break and then spend 2 weeks fixing the > resulting chaos. Add my yes vote to that one. Otherwise we are going to wind up missing a bunch of stuff and be chasing those down for the next few months instead of a couple of weeks. -- Mike Pritchard mpp@FreeBSD.org "Go that way. Really fast. If something gets in your way, turn" From owner-cvs-bin Mon Feb 17 14:57:59 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id OAA22305 for cvs-bin-outgoing; Mon, 17 Feb 1997 14:57:59 -0800 (PST) Received: from sneezy.sri.com (sneezy.sri.com [128.18.40.6]) by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id OAA22181; Mon, 17 Feb 1997 14:55:38 -0800 (PST) Received: from swift.rmlnet by sneezy.sri.com (SMI-8.6/SMI-SVR4) id OAA22252; Mon, 17 Feb 1997 14:50:53 -0800 Received: by swift.rmlnet (SMI-8.6/SMI-SVR4) id OAA26025; Mon, 17 Feb 1997 14:53:38 -0800 Date: Mon, 17 Feb 1997 14:53:38 -0800 Message-Id: <199702172253.OAA26025@swift.rmlnet> From: Nate Williams To: Peter Wemm Cc: "Jordan K. Hubbard" , Bruce Evans , cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org Subject: Re: cvs commit: src/bin/df df.c In-Reply-To: <199702170846.QAA01085@spinner.DIALix.COM> References: <25948.856166916@time.cdrom.com> <199702170846.QAA01085@spinner.DIALix.COM> Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > > > Please do this right by importing Lite2 and merging the relevant parts. > > > > Oh bleah. Vendor branch stuff. Can I just easy-import it with a vendor > > id of LITE2 or something and it'll DTRT? This has always been where > > my CVS knowledge gets fuzzy, and why I've never updated our version > > of GNU tar to 1.18 (I knew I'd have to do it as a contrib thing, and > > that'd involve branch hair :-). > > I didn't see what happened last time I suggested it, but I think the best > way to update the utilities to Lite2 is to import Lite2 for the entire > userland, allowing the tree to break and then spend 2 weeks fixing the > resulting chaos. I agree, and since the tree is already broken from the kernel stuff.. ;) Nate From owner-cvs-bin Mon Feb 17 17:33:26 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA02099 for cvs-bin-outgoing; Mon, 17 Feb 1997 17:33:26 -0800 (PST) Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id RAA02031; Mon, 17 Feb 1997 17:31:52 -0800 (PST) Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.3/8.6.9) id MAA18124; Tue, 18 Feb 1997 12:16:55 +1100 Date: Tue, 18 Feb 1997 12:16:55 +1100 From: Bruce Evans Message-Id: <199702180116.MAA18124@godzilla.zeta.org.au> To: nate@sneezy.sri.com, peter@spinner.dialix.com Subject: Re: cvs commit: src/bin/df df.c Cc: bde@zeta.org.au, cvs-all@freefall.freebsd.org, cvs-bin@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, jkh@time.cdrom.com Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk >> I didn't see what happened last time I suggested it, but I think the best >> way to update the utilities to Lite2 is to import Lite2 for the entire >> userland, allowing the tree to break and then spend 2 weeks fixing the >> resulting chaos. > >I agree, and since the tree is already broken from the kernel stuff.. ;) I disagree. There are plenty of problems to fix in the kernel, 2.2 and 2.1 and another delay of 2 weeks would be bad. The -current kernel works OK with old vfs-handling utilities provided you compile with option "COMPAT_LITE2" and initialize ovfs.vfc_vfsops to non-NULL in sysctl_ovfs_conf(). It took me a week to discover this because I thought that some utilities needed to be fixed first (mainly mount_nfs). Bruce From owner-cvs-bin Mon Feb 17 21:04:54 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id VAA17381 for cvs-bin-outgoing; Mon, 17 Feb 1997 21:04:54 -0800 (PST) Received: (from bde@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id VAA17371; Mon, 17 Feb 1997 21:04:52 -0800 (PST) Date: Mon, 17 Feb 1997 21:04:52 -0800 (PST) From: Bruce Evans Message-Id: <199702180504.VAA17371@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/dumplfs Makefile dumplfs.8 dumplfs.c extern.h misc.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 97/02/17 21:04:51 Removed: bin/dumplfs Makefile dumplfs.8 dumplfs.c extern.h misc.c Log: Moved mis-imported files to attic. From owner-cvs-bin Sat Feb 22 05:59:09 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA19212 for cvs-bin-outgoing; Sat, 22 Feb 1997 05:59:09 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA19205; Sat, 22 Feb 1997 05:59:08 -0800 (PST) Date: Sat, 22 Feb 1997 05:59:08 -0800 (PST) From: Peter Wemm Message-Id: <199702221359.FAA19205@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh Makefile TOUR alias.c alias.h arith.h arith.y arith_lex.l builtins.def cd.c error.c error.h eval.c eval.h exec.c exec.h expand.c expand.h histedit.c init.h input.c input.h jobs.c jobs.h machdep.h mail.c mail.h main.c main.h memalloc.c memalloc.h miscbltin.c mkbuiltins mkinit.c mknodes.c mksyntax.c mktokens myhistedit.h mystring.c mystring.h nodes.c.pat nodetypes options.c options.h output.c output.h parser.c parser.h redir.c redir.h sh.1 shell.h show.c show.h trap.c trap.h var.c var.h src/bin/sh/bltin bltin.h echo.1 echo.c src/bin/sh/funcs cmv dirs kill login newgrp popd pushd suspend Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/02/22 05:59:07 Modified: bin/sh Makefile TOUR alias.c alias.h arith.h arith.y arith_lex.l builtins.def cd.c error.c error.h eval.c eval.h exec.c exec.h expand.c expand.h histedit.c init.h input.c input.h jobs.c jobs.h machdep.h mail.c mail.h main.c main.h memalloc.c memalloc.h miscbltin.c mkbuiltins mkinit.c mknodes.c mksyntax.c mktokens myhistedit.h mystring.c mystring.h nodes.c.pat nodetypes options.c options.h output.c output.h parser.c parser.h redir.c redir.h sh.1 shell.h show.c show.h trap.c trap.h var.c var.h bin/sh/bltin bltin.h echo.1 echo.c bin/sh/funcs cmv dirs kill login newgrp popd pushd suspend Log: Revert $FreeBSD$ to $Id$ Revision Changes Path 1.17 +1 -1 src/bin/sh/Makefile 1.5 +1 -1 src/bin/sh/TOUR 1.7 +1 -1 src/bin/sh/alias.c 1.5 +1 -1 src/bin/sh/alias.h 1.4 +1 -1 src/bin/sh/arith.h 1.6 +1 -1 src/bin/sh/arith.y 1.9 +1 -1 src/bin/sh/arith_lex.l 1.5 +1 -1 src/bin/sh/builtins.def 1.14 +1 -1 src/bin/sh/cd.c 1.8 +1 -1 src/bin/sh/error.c 1.7 +1 -1 src/bin/sh/error.h 1.11 +1 -1 src/bin/sh/eval.c 1.6 +1 -1 src/bin/sh/eval.h 1.9 +1 -1 src/bin/sh/exec.c 1.6 +1 -1 src/bin/sh/exec.h 1.16 +1 -1 src/bin/sh/expand.c 1.5 +1 -1 src/bin/sh/expand.h 1.9 +1 -1 src/bin/sh/histedit.c 1.5 +1 -1 src/bin/sh/init.h 1.9 +1 -1 src/bin/sh/input.c 1.6 +1 -1 src/bin/sh/input.h 1.12 +1 -1 src/bin/sh/jobs.c 1.5 +1 -1 src/bin/sh/jobs.h 1.5 +1 -1 src/bin/sh/machdep.h 1.6 +1 -1 src/bin/sh/mail.c 1.5 +1 -1 src/bin/sh/mail.h 1.13 +1 -1 src/bin/sh/main.c 1.5 +1 -1 src/bin/sh/main.h 1.7 +1 -1 src/bin/sh/memalloc.c 1.5 +1 -1 src/bin/sh/memalloc.h 1.11 +1 -1 src/bin/sh/miscbltin.c 1.7 +1 -1 src/bin/sh/mkbuiltins 1.9 +1 -1 src/bin/sh/mkinit.c 1.7 +1 -1 src/bin/sh/mknodes.c 1.9 +1 -1 src/bin/sh/mksyntax.c 1.5 +1 -1 src/bin/sh/mktokens 1.6 +1 -1 src/bin/sh/myhistedit.h 1.7 +1 -1 src/bin/sh/mystring.c 1.5 +1 -1 src/bin/sh/mystring.h 1.5 +1 -1 src/bin/sh/nodes.c.pat 1.5 +1 -1 src/bin/sh/nodetypes 1.12 +1 -1 src/bin/sh/options.c 1.7 +1 -1 src/bin/sh/options.h 1.7 +1 -1 src/bin/sh/output.c 1.6 +1 -1 src/bin/sh/output.h 1.19 +1 -1 src/bin/sh/parser.c 1.6 +1 -1 src/bin/sh/parser.h 1.8 +1 -1 src/bin/sh/redir.c 1.6 +1 -1 src/bin/sh/redir.h 1.12 +1 -1 src/bin/sh/sh.1 1.10 +1 -1 src/bin/sh/shell.h 1.7 +1 -1 src/bin/sh/show.c 1.5 +1 -1 src/bin/sh/show.h 1.8 +1 -1 src/bin/sh/trap.c 1.6 +1 -1 src/bin/sh/trap.h 1.9 +1 -1 src/bin/sh/var.c 1.6 +1 -1 src/bin/sh/var.h 1.8 +1 -1 src/bin/sh/bltin/bltin.h 1.6 +1 -1 src/bin/sh/bltin/echo.1 1.7 +1 -1 src/bin/sh/bltin/echo.c 1.5 +1 -1 src/bin/sh/funcs/cmv 1.5 +1 -1 src/bin/sh/funcs/dirs 1.5 +1 -1 src/bin/sh/funcs/kill 1.5 +1 -1 src/bin/sh/funcs/login 1.5 +1 -1 src/bin/sh/funcs/newgrp 1.5 +1 -1 src/bin/sh/funcs/popd 1.5 +1 -1 src/bin/sh/funcs/pushd 1.5 +1 -1 src/bin/sh/funcs/suspend From owner-cvs-bin Sat Feb 22 06:06:33 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id GAA21534 for cvs-bin-outgoing; Sat, 22 Feb 1997 06:06:33 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id GAA21525; Sat, 22 Feb 1997 06:06:29 -0800 (PST) Date: Sat, 22 Feb 1997 06:06:29 -0800 (PST) From: Peter Wemm Message-Id: <199702221406.GAA21525@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin Makefile Makefile.inc src/bin/chmod Makefile chmod.1 chmod.c src/bin/cp Makefile cp.1 cp.c extern.h utils.c src/bin/csh Makefile alloc.c char.c char.h const.c csh.1 csh.c csh.h dir.c dir.h dol.c err.c exec.c exp.c extern.h file.c func.c glob.c hist.c init.c lex.c misc.c parse.c pathnames.h proc.c proc.h sem.c set.c str.c time.c src/bin/csh/USD.doc Makefile csh.1 csh.2 csh.3 csh.4 csh.a csh.g tabs src/bin/dd Makefile args.c conv.c conv_tab.c dd.1 dd.c dd.h extern.h misc.c position.c src/bin/domainname Makefile domainname.1 domainname.c src/bin/echo Makefile echo.1 echo.c src/bin/ed Makefile POSIX README buf.c cbc.c ed.1 ed.h glbl.c io.c main.c re.c sub.c undo.c src/bin/expr Makefile expr.1 expr.y src/bin/hostname Makefile hostname.1 hostname.c src/bin/ls Makefile cmp.c extern.h ls.1 ls.c ls.h print.c stat_flags.c util.c src/bin/mkdir Makefile mkdir.1 mkdir.c src/bin/pax Makefile ar_io.c ar_subs.c buf_subs.c cache.c cache.h cpio.c cpio.h extern.h file_subs.c ftree.c ftree.h gen_subs.c options.c options.h pat_rep.c pat_rep.h pax.1 pax.c pax.h sel_subs.c sel_subs.h tables.c tables.h tar.c tar.h tty_subs.c src/bin/pwd Makefile pwd.1 pwd.c src/bin/rcp Makefile extern.h pathnames.h rcp.1 rcp.c util.c src/bin/rm Makefile rm.1 rm.c src/bin/sleep Makefile sleep.1 sleep.c src/bin/stty Makefile cchar.c extern.h gfmt.c key.c modes.c print.c stty.1 stty.c stty.h util.c src/bin/cat Makefile cat.1 cat.c src/bin/date Makefile date.1 date.c extern.h netdate.c src/bin/df Makefile df.1 df.c src/bin/ed/test Makefile README ckscripts.sh mkscripts.sh src/bin/kill Makefile kill.1 kill.c src/bin/ln Makefile ln.1 ln.c symlink.7 src/bin/mv Makefile mv.1 mv.c pathnames.h src/bin/ps Makefile devname.c extern.h fmt.c keyword.c nlist.c print.c ps.1 ps.c ps.h src/bin/rmail Makefile rmail.8 rmail.c src/bin/rmdir Makefile rmdir.1 rmdir.c src/bin/sync Makefile sync.8 sync.c src/bin/test Makefile TEST.README TEST.csh TEST.sh operators.c operators.h test.1 test.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/02/22 06:06:28 Modified: bin Makefile Makefile.inc bin/cat Makefile cat.1 cat.c bin/chmod Makefile chmod.1 chmod.c bin/cp Makefile cp.1 cp.c extern.h utils.c bin/csh Makefile alloc.c char.c char.h const.c csh.1 csh.c csh.h dir.c dir.h dol.c err.c exec.c exp.c extern.h file.c func.c glob.c hist.c init.c lex.c misc.c parse.c pathnames.h proc.c proc.h sem.c set.c str.c time.c bin/csh/USD.doc Makefile csh.1 csh.2 csh.3 csh.4 csh.a csh.g tabs bin/date Makefile date.1 date.c extern.h netdate.c bin/dd Makefile args.c conv.c conv_tab.c dd.1 dd.c dd.h extern.h misc.c position.c bin/df Makefile df.1 df.c bin/domainname Makefile domainname.1 domainname.c bin/echo Makefile echo.1 echo.c bin/ed Makefile POSIX README buf.c cbc.c ed.1 ed.h glbl.c io.c main.c re.c sub.c undo.c bin/ed/test Makefile README ckscripts.sh mkscripts.sh bin/expr Makefile expr.1 expr.y bin/hostname Makefile hostname.1 hostname.c bin/kill Makefile kill.1 kill.c bin/ln Makefile ln.1 ln.c symlink.7 bin/ls Makefile cmp.c extern.h ls.1 ls.c ls.h print.c stat_flags.c util.c bin/mkdir Makefile mkdir.1 mkdir.c bin/mv Makefile mv.1 mv.c pathnames.h bin/pax Makefile ar_io.c ar_subs.c buf_subs.c cache.c cache.h cpio.c cpio.h extern.h file_subs.c ftree.c ftree.h gen_subs.c options.c options.h pat_rep.c pat_rep.h pax.1 pax.c pax.h sel_subs.c sel_subs.h tables.c tables.h tar.c tar.h tty_subs.c bin/ps Makefile devname.c extern.h fmt.c keyword.c nlist.c print.c ps.1 ps.c ps.h bin/pwd Makefile pwd.1 pwd.c bin/rcp Makefile extern.h pathnames.h rcp.1 rcp.c util.c bin/rm Makefile rm.1 rm.c bin/rmail Makefile rmail.8 rmail.c bin/rmdir Makefile rmdir.1 rmdir.c bin/sleep Makefile sleep.1 sleep.c bin/stty Makefile cchar.c extern.h gfmt.c key.c modes.c print.c stty.1 stty.c stty.h util.c bin/sync Makefile sync.8 sync.c bin/test Makefile TEST.README TEST.csh TEST.sh operators.c operators.h test.1 test.c Log: Revert $FreeBSD$ to $Id$ Revision Changes Path 1.6 +1 -1 src/bin/Makefile 1.9 +1 -1 src/bin/Makefile.inc 1.4 +1 -1 src/bin/cat/Makefile 1.6 +1 -1 src/bin/cat/cat.1 1.8 +1 -1 src/bin/cat/cat.c 1.4 +1 -1 src/bin/chmod/Makefile 1.7 +1 -1 src/bin/chmod/chmod.1 1.8 +1 -1 src/bin/chmod/chmod.c 1.4 +1 -1 src/bin/cp/Makefile 1.9 +1 -1 src/bin/cp/cp.1 1.13 +1 -1 src/bin/cp/cp.c 1.7 +1 -1 src/bin/cp/extern.h 1.13 +1 -1 src/bin/cp/utils.c 1.7 +1 -1 src/bin/csh/Makefile 1.6 +1 -1 src/bin/csh/alloc.c 1.4 +1 -1 src/bin/csh/char.c 1.4 +1 -1 src/bin/csh/char.h 1.6 +1 -1 src/bin/csh/const.c 1.8 +1 -1 src/bin/csh/csh.1 1.8 +1 -1 src/bin/csh/csh.c 1.4 +1 -1 src/bin/csh/csh.h 1.6 +1 -1 src/bin/csh/dir.c 1.4 +1 -1 src/bin/csh/dir.h 1.5 +1 -1 src/bin/csh/dol.c 1.4 +1 -1 src/bin/csh/err.c 1.6 +1 -1 src/bin/csh/exec.c 1.4 +1 -1 src/bin/csh/exp.c 1.4 +1 -1 src/bin/csh/extern.h 1.6 +1 -1 src/bin/csh/file.c 1.7 +1 -1 src/bin/csh/func.c 1.8 +1 -1 src/bin/csh/glob.c 1.4 +1 -1 src/bin/csh/hist.c 1.4 +1 -1 src/bin/csh/init.c 1.6 +1 -1 src/bin/csh/lex.c 1.5 +1 -1 src/bin/csh/misc.c 1.5 +1 -1 src/bin/csh/parse.c 1.4 +1 -1 src/bin/csh/pathnames.h 1.4 +1 -1 src/bin/csh/proc.c 1.4 +1 -1 src/bin/csh/proc.h 1.5 +1 -1 src/bin/csh/sem.c 1.6 +1 -1 src/bin/csh/set.c 1.5 +1 -1 src/bin/csh/str.c 1.7 +1 -1 src/bin/csh/time.c 1.4 +1 -1 src/bin/csh/USD.doc/Makefile 1.5 +1 -1 src/bin/csh/USD.doc/csh.1 1.5 +1 -1 src/bin/csh/USD.doc/csh.2 1.4 +1 -1 src/bin/csh/USD.doc/csh.3 1.4 +1 -1 src/bin/csh/USD.doc/csh.4 1.4 +1 -1 src/bin/csh/USD.doc/csh.a 1.4 +1 -1 src/bin/csh/USD.doc/csh.g 1.4 +1 -1 src/bin/csh/USD.doc/tabs 1.4 +1 -1 src/bin/date/Makefile 1.11 +1 -1 src/bin/date/date.1 1.10 +1 -1 src/bin/date/date.c 1.4 +1 -1 src/bin/date/extern.h 1.6 +1 -1 src/bin/date/netdate.c 1.4 +1 -1 src/bin/dd/Makefile 1.8 +1 -1 src/bin/dd/args.c 1.8 +1 -1 src/bin/dd/conv.c 1.6 +1 -1 src/bin/dd/conv_tab.c 1.4 +1 -1 src/bin/dd/dd.1 1.10 +1 -1 src/bin/dd/dd.c 1.6 +1 -1 src/bin/dd/dd.h 1.4 +1 -1 src/bin/dd/extern.h 1.7 +1 -1 src/bin/dd/misc.c 1.5 +1 -1 src/bin/dd/position.c 1.4 +1 -1 src/bin/df/Makefile 1.9 +1 -1 src/bin/df/df.1 1.13 +1 -1 src/bin/df/df.c 1.3 +1 -1 src/bin/domainname/Makefile 1.4 +1 -1 src/bin/domainname/domainname.1 1.8 +1 -1 src/bin/domainname/domainname.c 1.4 +1 -1 src/bin/echo/Makefile 1.5 +1 -1 src/bin/echo/echo.1 1.6 +1 -1 src/bin/echo/echo.c 1.15 +1 -1 src/bin/ed/Makefile 1.6 +1 -1 src/bin/ed/POSIX 1.6 +1 -1 src/bin/ed/README 1.10 +1 -1 src/bin/ed/buf.c 1.9 +1 -1 src/bin/ed/cbc.c 1.10 +1 -1 src/bin/ed/ed.1 1.10 +1 -1 src/bin/ed/ed.h 1.7 +1 -1 src/bin/ed/glbl.c 1.8 +1 -1 src/bin/ed/io.c 1.9 +1 -1 src/bin/ed/main.c 1.13 +1 -1 src/bin/ed/re.c 1.9 +1 -1 src/bin/ed/sub.c 1.6 +1 -1 src/bin/ed/undo.c 1.8 +1 -1 src/bin/ed/test/Makefile 1.6 +1 -1 src/bin/ed/test/README 1.5 +1 -1 src/bin/ed/test/ckscripts.sh 1.5 +1 -1 src/bin/ed/test/mkscripts.sh 1.12 +1 -1 src/bin/expr/Makefile 1.6 +1 -1 src/bin/expr/expr.1 1.13 +1 -1 src/bin/expr/expr.y 1.4 +1 -1 src/bin/hostname/Makefile 1.6 +1 -1 src/bin/hostname/hostname.1 1.5 +1 -1 src/bin/hostname/hostname.c 1.4 +1 -1 src/bin/kill/Makefile 1.6 +1 -1 src/bin/kill/kill.1 1.6 +1 -1 src/bin/kill/kill.c 1.5 +1 -1 src/bin/ln/Makefile 1.5 +1 -1 src/bin/ln/ln.1 1.9 +1 -1 src/bin/ln/ln.c 1.4 +1 -1 src/bin/ln/symlink.7 1.4 +1 -1 src/bin/ls/Makefile 1.6 +1 -1 src/bin/ls/cmp.c 1.4 +1 -1 src/bin/ls/extern.h 1.10 +1 -1 src/bin/ls/ls.1 1.13 +1 -1 src/bin/ls/ls.c 1.5 +1 -1 src/bin/ls/ls.h 1.12 +1 -1 src/bin/ls/print.c 1.5 +1 -1 src/bin/ls/stat_flags.c 1.8 +1 -1 src/bin/ls/util.c 1.4 +1 -1 src/bin/mkdir/Makefile 1.6 +1 -1 src/bin/mkdir/mkdir.1 1.8 +1 -1 src/bin/mkdir/mkdir.c 1.4 +1 -1 src/bin/mv/Makefile 1.9 +1 -1 src/bin/mv/mv.1 1.11 +1 -1 src/bin/mv/mv.c 1.4 +1 -1 src/bin/mv/pathnames.h 1.4 +1 -1 src/bin/pax/Makefile 1.7 +1 -1 src/bin/pax/ar_io.c 1.7 +1 -1 src/bin/pax/ar_subs.c 1.7 +1 -1 src/bin/pax/buf_subs.c 1.6 +1 -1 src/bin/pax/cache.c 1.4 +1 -1 src/bin/pax/cache.h 1.7 +1 -1 src/bin/pax/cpio.c 1.5 +1 -1 src/bin/pax/cpio.h 1.4 +1 -1 src/bin/pax/extern.h 1.7 +1 -1 src/bin/pax/file_subs.c 1.7 +1 -1 src/bin/pax/ftree.c 1.4 +1 -1 src/bin/pax/ftree.h 1.9 +1 -1 src/bin/pax/gen_subs.c 1.7 +1 -1 src/bin/pax/options.c 1.4 +1 -1 src/bin/pax/options.h 1.8 +1 -1 src/bin/pax/pat_rep.c 1.4 +1 -1 src/bin/pax/pat_rep.h 1.5 +1 -1 src/bin/pax/pax.1 1.8 +1 -1 src/bin/pax/pax.c 1.6 +1 -1 src/bin/pax/pax.h 1.6 +1 -1 src/bin/pax/sel_subs.c 1.4 +1 -1 src/bin/pax/sel_subs.h 1.7 +1 -1 src/bin/pax/tables.c 1.5 +1 -1 src/bin/pax/tables.h 1.7 +1 -1 src/bin/pax/tar.c 1.4 +1 -1 src/bin/pax/tar.h 1.6 +1 -1 src/bin/pax/tty_subs.c 1.8 +1 -1 src/bin/ps/Makefile 1.5 +1 -1 src/bin/ps/devname.c 1.5 +1 -1 src/bin/ps/extern.h 1.9 +1 -1 src/bin/ps/fmt.c 1.12 +1 -1 src/bin/ps/keyword.c 1.8 +1 -1 src/bin/ps/nlist.c 1.19 +1 -1 src/bin/ps/print.c 1.13 +1 -1 src/bin/ps/ps.1 1.17 +1 -1 src/bin/ps/ps.c 1.4 +1 -1 src/bin/ps/ps.h 1.4 +1 -1 src/bin/pwd/Makefile 1.5 +1 -1 src/bin/pwd/pwd.1 1.5 +1 -1 src/bin/pwd/pwd.c 1.7 +1 -1 src/bin/rcp/Makefile 1.4 +1 -1 src/bin/rcp/extern.h 1.4 +1 -1 src/bin/rcp/pathnames.h 1.5 +1 -1 src/bin/rcp/rcp.1 1.11 +1 -1 src/bin/rcp/rcp.c 1.7 +1 -1 src/bin/rcp/util.c 1.5 +1 -1 src/bin/rm/Makefile 1.7 +1 -1 src/bin/rm/rm.1 1.14 +1 -1 src/bin/rm/rm.c 1.6 +1 -1 src/bin/rmail/Makefile 1.5 +1 -1 src/bin/rmail/rmail.8 1.9 +1 -1 src/bin/rmail/rmail.c 1.4 +1 -1 src/bin/rmdir/Makefile 1.6 +1 -1 src/bin/rmdir/rmdir.1 1.5 +1 -1 src/bin/rmdir/rmdir.c 1.4 +1 -1 src/bin/sleep/Makefile 1.6 +1 -1 src/bin/sleep/sleep.1 1.5 +1 -1 src/bin/sleep/sleep.c 1.4 +1 -1 src/bin/stty/Makefile 1.7 +1 -1 src/bin/stty/cchar.c 1.4 +1 -1 src/bin/stty/extern.h 1.7 +1 -1 src/bin/stty/gfmt.c 1.8 +1 -1 src/bin/stty/key.c 1.6 +1 -1 src/bin/stty/modes.c 1.8 +1 -1 src/bin/stty/print.c 1.6 +1 -1 src/bin/stty/stty.1 1.9 +1 -1 src/bin/stty/stty.c 1.4 +1 -1 src/bin/stty/stty.h 1.6 +1 -1 src/bin/stty/util.c 1.5 +1 -1 src/bin/sync/Makefile 1.6 +1 -1 src/bin/sync/sync.8 1.7 +1 -1 src/bin/sync/sync.c 1.4 +1 -1 src/bin/test/Makefile 1.3 +1 -1 src/bin/test/TEST.README 1.5 +1 -1 src/bin/test/TEST.csh 1.5 +1 -1 src/bin/test/TEST.sh 1.6 +1 -1 src/bin/test/operators.c 1.5 +1 -1 src/bin/test/operators.h 1.4 +1 -1 src/bin/test/test.1 1.17 +1 -1 src/bin/test/test.c From owner-cvs-bin Sat Feb 22 11:31:28 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id LAA06064 for cvs-bin-outgoing; Sat, 22 Feb 1997 11:31:28 -0800 (PST) Received: (from joerg@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id LAA06038; Sat, 22 Feb 1997 11:31:26 -0800 (PST) Date: Sat, 22 Feb 1997 11:31:26 -0800 (PST) From: Joerg Wunsch Message-Id: <199702221931.LAA06038@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin Subject: cvs commit: src/bin/sh expand.c Sender: owner-cvs-bin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 97/02/22 11:31:25 Branch: bin/sh RELENG_2_2 Modified: bin/sh expand.c Log: YAMFC (rev 1.15: fix expansion bug) Revision Changes Path 1.11.2.1 +6 -3 src/bin/sh/expand.c