Re: merge losing changes, no Conflict

[Markus Warg]

Larry,

okay, war unsure, looked into the repository right now: there are few
.# files, all in CVSROOT. There are lots of # files, almost one in
every directory, all size 0.

I thought only #cvs.lock directories are for locking?

We've not configured something like lock when checked out or so...

Markus

On Don, 08 Nov 2001, Larry Jones wrote:

> Markus Warg writes:
> > 
> > no to both of you. The # files do not show up in cvs status, they look
> > like #cvs.wfl.<hostname>.1770 and are 0 byte in size mostly.
> 
> You said they were .# files, not # files!  Like Paul said, those are
> lock files: see <http://www.cvshome.org/docs/manual/cvs_2.html#SEC17>. 
> If they're there when no one is using CVS, they indicate a serious
> problem -- either CVS is crashing, or someone has been killing it
> without allowing it to cleanup after itself -- and will prevent people
> from doing some or all CVS operations in that directory.
> 
> -Larry Jones
> 
> My life needs a rewind/erase button. -- Calvin

-- 
Markus Warg
VIA NET.WORKS Deutschland GmbH, Bismarckstrasse 120, D-47057 Duisburg
Geschäftsführung: Matt Nydell, Wim Vink. Amtsgericht Duisburg, HRB 7672
Phone: +49 203-3093 159, Fax: +49 203-3093 112
E-Mail: address@hidden
http://www.vianetworks.de
Alle Angebote sind unverbindlich.
Auftraege erledigen wir zu unseren allgemeinen Geschaeftsbedingungen.