Apache OpenOffice (AOO) Bugzilla – Issue 11947
2 versions are shown simultaneously
Last modified: 2004-08-02 22:45:54 UTC
The versions 1.15 and 1.16 are shown simultaneously on this page.
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
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
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
It looks good. Thank you!
resolved
verified and closing
The same problem with http://de.openoffice.org/index.html
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
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.
the operations group has taken the steps to resolve
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
Closing this issue.