From owner-freebsd-current  Sun Apr  9 18:34:29 2000
Delivered-To: freebsd-current@freebsd.org
Received: from rover.village.org (rover.village.org [204.144.255.49])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3548837B807; Sun,  9 Apr 2000 18:34:26 -0700 (PDT)
	(envelope-from imp@harmony.village.org)
Received: from harmony.village.org (harmony.village.org [10.0.0.6])
	by rover.village.org (8.9.3/8.9.3) with ESMTP id TAA17358;
	Sun, 9 Apr 2000 19:34:24 -0600 (MDT)
	(envelope-from imp@harmony.village.org)
Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.3/8.8.3) with ESMTP id TAA15207; Sun, 9 Apr 2000 19:34:20 -0600 (MDT)
Message-Id: <200004100134.TAA15207@harmony.village.org>
To: Kris Kennaway <kris@FreeBSD.ORG>
Subject: Re: Resolving conflicts with CVS 
Cc: current@FreeBSD.ORG
In-reply-to: Your message of "Sun, 09 Apr 2000 17:18:04 PDT."
		<Pine.BSF.4.21.0004091714100.78048-100000@freefall.freebsd.org> 
References: <Pine.BSF.4.21.0004091714100.78048-100000@freefall.freebsd.org>  
Date: Sun, 09 Apr 2000 19:34:20 -0600
From: Warner Losh <imp@village.org>
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

In message <Pine.BSF.4.21.0004091714100.78048-100000@freefall.freebsd.org> Kris Kennaway writes:
: setenv CVSROOT /path/to/new/repo
: cvs init
: cp -rp /home/ncvs/src/whatever /path/to/new/repo/subdir
: cvs co whatever
: cvs import ...

The hard part in this is when files leave the tree.  cvs import
doesn't cope with that at all well.  And don't even get me started on
files that leave the tree and then come back.

Warner


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message