From owner-freebsd-current Sun Apr 9 17:18: 8 2000 Delivered-To: freebsd-current@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id A933E37B5E6 for ; Sun, 9 Apr 2000 17:18:05 -0700 (PDT) (envelope-from kris@FreeBSD.org) Received: from localhost (kris@localhost) by freefall.freebsd.org (8.9.3/8.9.2) with ESMTP id RAA78421 for ; Sun, 9 Apr 2000 17:18:05 -0700 (PDT) (envelope-from kris@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: kris owned process doing -bs Date: Sun, 9 Apr 2000 17:18:04 -0700 (PDT) From: Kris Kennaway To: current@freebsd.org Subject: Resolving conflicts with CVS Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message