From owner-freebsd-current Sun Apr 9 18:42:55 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 45C5C37B859; Sun, 9 Apr 2000 18:42:54 -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 SAA88752; Sun, 9 Apr 2000 18:42:54 -0700 (PDT) (envelope-from kris@FreeBSD.org) X-Authentication-Warning: freefall.freebsd.org: kris owned process doing -bs Date: Sun, 9 Apr 2000 18:42:53 -0700 (PDT) From: Kris Kennaway To: Warner Losh Cc: current@FreeBSD.ORG Subject: Re: Resolving conflicts with CVS In-Reply-To: <200004100134.TAA15207@harmony.village.org> 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 On Sun, 9 Apr 2000, Warner Losh wrote: > 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. The problem I was trying to solve was working out in advance what conflicts are going to arise when I cvs import a new version of software and making sure I can deal with them promptly without having to do some fancy hacking once it's already imported. 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