From owner-cvs-sbin Wed Mar 26 12:28:39 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id MAA20808 for cvs-sbin-outgoing; Wed, 26 Mar 1997 12:28:39 -0800 (PST) Received: from gvr.win.tue.nl (root@gvr.win.tue.nl [131.155.210.19]) by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA20787; Wed, 26 Mar 1997 12:28:29 -0800 (PST) Received: (from guido@localhost) by gvr.win.tue.nl (8.8.5/8.8.2) id VAA15659; Wed, 26 Mar 1997 21:28:24 +0100 (MET) From: Guido van Rooij Message-Id: <199703262028.VAA15659@gvr.win.tue.nl> Subject: Re: cvs commit: src/sys/kern vfs_syscalls.c src/sys/ufs/ffs ffs_alloc.c ffs_vfsops.c fs.h src/sbin Makefile src/sbin/newfs Makefile In-Reply-To: <199703262006.MAA18134@freefall.freebsd.org> from Guido van Rooij at "Mar 26, 97 12:06:13 pm" To: guido@freefall.freebsd.org (Guido van Rooij) Date: Wed, 26 Mar 1997 21:28:24 +0100 (MET) Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org, cvs-sbin@freefall.freebsd.org X-Mailer: ELM [version 2.4ME+ PL28 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-sbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Guido van Rooij wrote: > guido 97/03/26 12:06:12 > > Branch: sbin RELENG_2_2 > sbin/newfs RELENG_2_2 > sys/ufs/ffs RELENG_2_2 > Modified: sbin Makefile > sbin/newfs Makefile mkfs.c > sys/kern vfs_syscalls.c > sys/ufs/ffs ffs_alloc.c ffs_vfsops.c fs.h > Log: > Backport of the fsirand stuff to 2.2. I'm sorry this is too late for 2.2.1 > YIKES: I forgot to cvs add fsirand. Somehow, however I cannot seem to do that. Can somebody please advise me on how a directory and files added on head can be merged into an older branch? -Guido