Date: Wed, 06 Dec 1995 16:11:19 -0800 From: David Greenman <davidg@Root.COM> To: Terry Lambert <terry@lambert.org> 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 Message-ID: <199512070011.QAA17894@corbin.Root.COM> In-Reply-To: Your message of "Wed, 06 Dec 95 16:31:43 MST." <199512062331.QAA02360@phaeton.artisoft.com>
next in thread | previous in thread | raw e-mail | index | archive | help
>> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199512070011.QAA17894>