Date: Wed, 6 Dec 1995 17:41:27 -0700 (MST) From: Terry Lambert <terry@lambert.org> To: davidg@root.com Cc: terry@lambert.org, 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: <199512070041.RAA02545@phaeton.artisoft.com> In-Reply-To: <199512070011.QAA17894@corbin.Root.COM> from "David Greenman" at Dec 6, 95 04:11:19 pm
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 :-)). 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199512070041.RAA02545>