Synopsis: CVSROOT has numerous .# conflict litter in it. State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Thu Sep 25 10:55:05 PDT 1997 State-Changed-Why: Thanks for the tip, but those .# files are in the CVSROOT directory of the repository, which is managed by cvs ... and cvs creates them as part of it's normal operation. None of our source code is in there.
The existance of a .# file in a working copy does not mean there was a conflict, it just means that a merge occured. So it'd be a little draconian to disallow commits in that case. Testing for <<<<<<<<, ========, or >>>>>>>> would be much better. Dean
