Date: Sun, 9 Apr 2000 17:18:04 -0700 (PDT) From: Kris Kennaway <kris@FreeBSD.org> To: current@freebsd.org Subject: Resolving conflicts with CVS Message-ID: <Pine.BSF.4.21.0004091714100.78048-100000@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
I thought it might be of use to someone to know the following tip for
working out in advance which files are going to conflict with a CVS import
and how to resolve them (I asked around on IRC for a few days and no-one
seemed to have any suggestions about how to do this).
Basically, just create a mini-CVS repository locally by copying the
relevant parts of /home/ncvs, and run the import there. Simple in
hindsight, but it wasn't obvious to me at the time.
setenv CVSROOT /path/to/new/repo
cvs init
cp -rp /home/ncvs/src/whatever /path/to/new/repo/subdir
cvs co whatever
cvs import ...
Kris
----
In God we Trust -- all others must submit an X.509 certificate.
-- Charles Forsythe <forsythe@alum.mit.edu>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0004091714100.78048-100000>