Re: files wrongly in cvs

Dumas Patrice wrote:

>>spew extra garbage, and generate usable commit emails.  There still 
>>appears to be a problem with cvs up -j, but it looks like a bug that is 
>>still in the CVS trunk.
>>    
>>
>
>Does this explain why I get this when doing cvs up:
>
>cvs server: Updating Tests/texinfo_res
>RCS file: /cvs/texi2html/Tests/texinfo_res/--apropos.html,v
>retrieving revision 1.1
>retrieving revision 1.5
>Merging differences between 1.1 and 1.5 into --apropos.html
>diff3: unrecognized option `--apropos.html'
>cvs server: Try `diff3 --help' for more information.
>
>This prevents a commit:
>
>cvs server: Up-to-date check failed for `Tests/texinfo_res/--apropos.html'
>cvs [server aborted]: correct above errors first!
>cvs commit: saving log message in /tmp/cvsHQfIXF
>  
>

Hrm.  Yes.  Updates now work, but not merges, apparently.  For now you 
should be able to work around the problem by moving --apropos.html out 
of the way, updating, and moving it back.  After that you should be fine 
unless someone besides you commits changes to the file.

I will look into fixing CVS and updating the version on cvshome.org again.

Derek

-- 
                *8^)

Email: [email protected]

Get CVS support at <http://ximbiot.com>!
-- 
105. I don't suffer from insanity. I enjoy every minute of it.