Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Mar 1997 16:36:38 -0800 (PST)
From:      Mike Pritchard <mpp>
To:        guido@gvr.win.tue.nl (Guido van Rooij)
Cc:        guido@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-sys@freefall.freebsd.org, cvs-sbin@freefall.freebsd.org
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 Make
Message-ID:  <199703270036.QAA16532@freefall.freebsd.org>
In-Reply-To: <199703262028.VAA15659@gvr.win.tue.nl> from "Guido van Rooij" at Mar 26, 97 09:28:24 pm

next in thread | previous in thread | raw e-mail | index | archive | help
Guido van Rooij wrote:
> 
> >   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? 

Since I had the stuff checked out to fix a typo in the man page, I just
went ahead and did it for you :-).  You still need to update the 2.2 Makefile
to enable fsirand.

In the future, if you have just added the file to -current, and then want 
to add it to another branch, do this:

cvs add newfile.c
cvs ci newfile.c
cvs tag -b RELENG_2_2 newfile.c

-- 
Mike Pritchard
mpp@FreeBSD.org
"Go that way.  Really fast.  If something gets in your way, turn"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703270036.QAA16532>