Issue 11947 - 2 versions are shown simultaneously
Summary: 2 versions are shown simultaneously
Status: CLOSED FIXED
Alias: None
Product: Infrastructure
Classification: Infrastructure
Component: Website general issues (show other issues)
Version: current
Hardware: All All
: P2 Trivial (vote)
Target Milestone: ---
Assignee: Unknown
QA Contact: issues@www
URL: http://de.openoffice.org/index.html
Keywords:
Depends on: 8731
Blocks:
  Show dependency tree
 
Reported: 2003-03-01 17:08 UTC by m.webermann
Modified: 2004-08-02 22:45 UTC (History)
3 users (show)

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

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description m.webermann 2003-03-01 17:08:48 UTC 
The versions 1.15 and 1.16 are shown simultaneously on this page.
Comment 1 stx123 2003-03-03 11:37:17 UTC 
There is a conflict during update of the content for the web
publishing area. See the output of my commit below.

Checking in about-legal.html;
/cvs/de/www/about-legal.html,v  <--  about-legal.html
new revision: 1.17; previous revision: 1.16
done
Processing log script arguments...
Mailing the commit message to cvs@de.openoffice.org (from
st@openoffice.org)
M about-facts.html
RCS file:
/usr/local/tigris/data/helm/cvs/repository/de/www/about-legal.html,v
retrieving revision 1.16
retrieving revision 1.17
Merging differences between 1.16 and 1.17 into about-legal.html
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in about-legal.html
C about-legal.html
? dev/neu/doc/faq/writer
Comment 2 Unknown 2003-03-03 17:10:43 UTC 
verified
ap:
1) file internal issue for the operations group to take a look at the
repository and resolve this issue
2) update this issue as the issue is updated or resolved.
PCN 15433 filed, step 1 complete
timeframe: I will update this issue by 3/4/03
Comment 3 Unknown 2003-03-05 18:23:17 UTC 
ops & engineering removed the last file and issued a cvs up command
which took care of the problem. Visually the page looks good. Please
verify
Comment 4 m.webermann 2003-03-05 20:57:03 UTC 
It looks good.

Thank you!
Comment 5 stx123 2003-03-05 21:15:41 UTC 
resolved
Comment 6 stx123 2003-03-24 11:40:17 UTC 
verified and closing
Comment 7 m.webermann 2003-04-16 11:41:49 UTC 
The same problem with http://de.openoffice.org/index.html
Comment 8 stx123 2003-04-23 10:33:54 UTC 
Same error, now with de/www/index.html.
See the log:

$ cvsoo commit -m "testing conflict" index.html
Checking in index.html;
/cvs/de/www/index.html,v  <--  index.html
new revision: 1.64; previous revision: 1.63
done
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/index.html,v
retrieving revision 1.63
retrieving revision 1.64
Merging differences between 1.63 and 1.64 into index.html
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in index.html
C index.html
Comment 9 Unknown 2003-04-23 16:29:12 UTC 
I have opened a new internal issue to have this resolved. In the
future  please file a new and separate issue for this type of
occurance. You can refer to the previous issue in the comments of the
new issue. Thanks.
Comment 10 Unknown 2003-04-23 17:11:35 UTC 
the operations group has taken the steps to resolve
Comment 11 Unknown 2003-07-10 03:55:54 UTC 
Hi Martin,
Can the status of this issue be changed to Closed?
I'm just reviewing all of the issues with a status of Resolved and
want to make sure they're up to date.
Thanks,
Kristen
Comment 12 Unknown 2004-08-02 22:45:54 UTC 
Closing this issue.