[4suite] CVS problems

[Martin v. Loewis]

> What do you get if you do a
> 
> cvs status <filename>
> 
> On the offending files?

===================================================================
File: de.po             Status: Locally Modified
 
   Working revision:    1.1
   Repository revision: 1.1     /var/local/cvsroot/Ft/Rdf/de.po,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

> Note that I have checked in XPath/de.po

The file in question was Rdf/de.po and a number of other files with
local changes which I had to undo in order to complete the update.

For a file that is added but also exists locally, cvs would report
"... is in the way, please remove it" or some such.

Regards,
Martin