Re: merge losing changes, no Conflict

[Paul Sander]

Those would be write locks in the repository, which are expected during
operations that modify the repository, such as committing and tagging.
They alone would not account for the behavior you're seeing.

--- Forwarded mail from address@hidden

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.
As nothing weird happened until now, I'll keep an eye on this but
ignore for now...

On Mit, 07 Nov 2001, Larry Jones wrote:

> Paul Sander writes [about .# files in the repository]:
> > 
> > Or, someone's been checking them in.  Do they show up when you do a
> > "cvs status"?
> 
> Or more simply, do they end with ,v?  If so, then they're RCS files,
> which means that someone has checked in .# files (which isn't a problem
> per se, but it might indicate that someone got confused and checked in
> CVS backup files).

--- End of forwarded message from address@hidden