Issue 7353 - CVS problems
Summary: CVS problems
Status: CLOSED FIXED
Alias: None
Product: Infrastructure
Classification: Infrastructure
Component: _openoffice.org CVS (obsolete) (show other issues)
Version: current
Hardware: PC Windows 2000
: P3 Trivial (vote)
Target Milestone: ---
Assignee: Unknown
QA Contact: issues@www
URL:
Keywords:
Depends on:
Blocks: 8731
  Show dependency tree
 
Reported: 2002-08-30 13:17 UTC by floeff+ooo
Modified: 2003-12-06 14:52 UTC (History)
3 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments

Note You need to log in before you can comment on or make changes to this issue.
Description floeff+ooo 2002-08-30 13:17:39 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
Comment 1 timon.schroeter 2002-08-30 16:10:53 UTC
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. 
Comment 2 Unknown 2002-08-30 17:25:09 UTC
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.
Comment 3 timon.schroeter 2002-09-01 12:05:00 UTC
Hi, 
 
http://de.openoffice.org/about-projects.html  
 
looks good now, but 
 
http://de.openoffice.org/about-whiteboard.html  
  
is still mangled.  
Comment 4 stx123 2002-09-02 10:26:26 UTC
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
Comment 5 floeff+ooo 2002-09-02 10:38:00 UTC
Still doesn't work :(
Comment 6 Unknown 2002-09-03 16:46:42 UTC
We should have the about-whiteboard page taken care of today.
Comment 7 Unknown 2002-09-03 17:59:57 UTC
http://de.openoffice.org/about-whiteboard.html should be taken care
of.  Please confirm.
Comment 8 floeff+ooo 2002-09-03 18:08:01 UTC
Thanks, has been fixed! ;-)
Comment 9 michael.bemmer 2003-03-24 08:21:33 UTC
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.
Comment 10 michael.bemmer 2003-03-24 08:25:53 UTC
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.