That happens when guys like us two do something they don't really know anything about. :-) No seriously, we manually modified the CVS working copy in that directory. When we later do a cvs up, changes are merged. That's what happened. We screwed up and got conflicts. We should have read the page about doc management on our own site and we wouldn't have had any problems.
I've run "cvs up -dPC" undo any local changes in that working copy. After the next rsync everything should go back to normal. Sorry guys! On 24.03.2005 06:47:52 The Web Maestro wrote: > On Mar 23, 2005, at 1:37 PM, Jeremias Maerki wrote: > > Zarro Boogs now (to quote Bugzilla). I'll publish the site now. > > > > Jeremias Maerki > > I did a 'cvs up' and was about to congratulate you, Jeremias. > Unfortunately, the FOP site had some problems loading.(I can supply a > screenshot if you'd like...). Anyway, I've tried to upload my updated, > rendered version, hoping that'd take care of the problem. Unfortunately > it hasn't. > > I'm uploading to: > > cvs.apache.org/www.xml.apache.org/fop > > Anyone have any ideas? it looks like the file that's loading is a DIFF > or something (e.g., a CVS 'index.xml,v' file or something). > > Web Maestro Clay > -- > <[EMAIL PROTECTED]> - <http://homepage.mac.com/webmaestro/> > My religion is simple. My religion is kindness. > - HH The 14th Dalai Lama of Tibet Jeremias Maerki
