From owner-freebsd-current Wed Dec 6 16:11:01 1995 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id QAA09616 for current-outgoing; Wed, 6 Dec 1995 16:11:01 -0800 (PST) Received: from Root.COM (implode.Root.COM [198.145.90.17]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id QAA09606 for ; Wed, 6 Dec 1995 16:10:53 -0800 (PST) Received: from corbin.Root.COM (corbin [198.145.90.50]) by Root.COM (8.6.12/8.6.5) with ESMTP id QAA04554; Wed, 6 Dec 1995 16:10:51 -0800 Received: from localhost (localhost [127.0.0.1]) by corbin.Root.COM (8.6.12/8.6.5) with SMTP id QAA17894; Wed, 6 Dec 1995 16:11:20 -0800 Message-Id: <199512070011.QAA17894@corbin.Root.COM> To: Terry Lambert cc: gibbs@freefall.freebsd.org, phk@critter.tfs.com, imb@scgt.oz.au, julian@ref.tfs.com, current@freebsd.org Subject: Re: changes in -current..TEST please In-reply-to: Your message of "Wed, 06 Dec 95 16:31:43 MST." <199512062331.QAA02360@phaeton.artisoft.com> From: David Greenman Reply-To: davidg@Root.COM Date: Wed, 06 Dec 1995 16:11:19 -0800 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 :-)). -DG