Re: merge losing changes, no Conflict

[Larry Jones]

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