Apache OpenOffice (AOO) Bugzilla – Issue 7353
CVS problems
Last modified: 2003-12-06 14:52:32 UTC
The CVS seems to destroy our file located at http://de.openoffice.org/about-whiteboard.html The CVS version is correct, however, have a look at the web site. It seems as if the versions got inserted again and again. Thanks, Florian
This is the case for: http://de.openoffice.org/about-whiteboard.html http://de.openoffice.org/about-projects.html Florian: We can circumvent the problem quickly by renaming and adding the files again, the chaning out links to point at the new files. OTOH: If the server does something weird, letting somebody at collab.net have a look at it is probably not a bad idea, either. Let's see what they (can) do.
I have seen something like this before. It looks like a commit of the file was not complelted for some reason. I have opened an internal issue and should have the pages back in shape soon.
Hi, http://de.openoffice.org/about-projects.html looks good now, but http://de.openoffice.org/about-whiteboard.html is still mangled.
After a clean checkout I modified and committed de/www/about- whiteboard.html. The the log below. % cvsoo commit -m "new test" about-whiteboard.html Checking in about-whiteboard.html; /cvs/de/www/about-whiteboard.html,v <-- about-whiteboard.html new revision: 1.12; previous revision: 1.11 done 1 file(s) commited Processing log script arguments... Mailing the commit message to cvs@de.openoffice.org (from st@openoffice.org) RCS file: /usr/local/tigris/data/helm/cvs/repository/de/www/about- whiteboard.html,v retrieving revision 1.11 retrieving revision 1.12 Merging differences between 1.11 and 1.12 into about-whiteboard.html rcsmerge: warning: conflicts during merge cvs update: conflicts found in about-whiteboard.html C about-whiteboard.html
Still doesn't work :(
We should have the about-whiteboard page taken care of today.
http://de.openoffice.org/about-whiteboard.html should be taken care of. Please confirm.
Thanks, has been fixed! ;-)
As agreed by Louis I will close these resolved fixed support-owned issues now. If you have trouble with that, please re-open the issue.