Date: Sun, 9 Apr 2000 18:42:53 -0700 (PDT) From: Kris Kennaway <kris@FreeBSD.org> To: Warner Losh <imp@village.org> Cc: current@FreeBSD.ORG Subject: Re: Resolving conflicts with CVS Message-ID: <Pine.BSF.4.21.0004091841480.88513-100000@freefall.freebsd.org> In-Reply-To: <200004100134.TAA15207@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <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.0004091841480.88513-100000>