From owner-freebsd-current Wed Dec 6 16:46:11 1995 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id QAA13173 for current-outgoing; Wed, 6 Dec 1995 16:46:11 -0800 (PST) Received: from phaeton.artisoft.com (phaeton.Artisoft.COM [198.17.250.211]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id QAA13165 for ; Wed, 6 Dec 1995 16:46:08 -0800 (PST) Received: (from terry@localhost) by phaeton.artisoft.com (8.6.11/8.6.9) id RAA02545; Wed, 6 Dec 1995 17:41:27 -0700 From: Terry Lambert Message-Id: <199512070041.RAA02545@phaeton.artisoft.com> Subject: Re: changes in -current..TEST please To: davidg@root.com Date: Wed, 6 Dec 1995 17:41:27 -0700 (MST) Cc: terry@lambert.org, gibbs@freefall.freebsd.org, phk@critter.tfs.com, imb@scgt.oz.au, julian@ref.tfs.com, current@freebsd.org In-Reply-To: <199512070011.QAA17894@corbin.Root.COM> from "David Greenman" at Dec 6, 95 04:11:19 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-current@freebsd.org Precedence: bulk > >> This happens if you 'rm' the .# files that are created when a merge > >> happens. Don't do that. > > > >What happens if it was a merge on FreeFall? > > > >I'm not deleting .# files from merges *I* do locally... > > You're SUPing the CVS tree and doing your own checkouts, right? The .# > files are *not* in the CVS repository. The are created by CVS during a merge - > they contain the previous contents of the file before the merge. If you see > them, then they are created by *you* and you should not delete them (unless > you know what you're doing :-)). I am *NOT* deleting files! I am: 1) SUP the CVS 2) cd /sys 3) cvs update . *BOOM* The problem occurs because the files do not exist in the first place, not because they existed, but then I murdered them. Are they supposed to be in my checked out copy of the tree? How does the CVS come to the conclusion that the should exist -- it checks the repository data, right? The repository data is incorrect because I never had the files in the first place. They existed only on FreeFall and weren't copied down with the rest of everything else. Terry Lambert terry@lambert.org --- Any opinions in this posting are my own and not those of my present or previous employers.