Apache OpenOffice (AOO) Bugzilla – Issue 52074
conflicts in the local working directory of the automation tool
Last modified: 2005-07-25 11:51:21 UTC
Could you please remove conflicts in the local working directory from which the automation tool converts updated files in the CVS system into decorated files for the Web site? Problem: Current top page of ja.ooo, http://ja.openoffice.org/index.html , has been contaminated with unexpected marks like <<<<<<< driver.c exit(nerr == 0 ? EXIT_SUCCESS : EXIT_FAILURE); ======= exit(!!nerr); >>>>>>> 1.6 that points conflicts described in the document of CVS at http://www.gnu.org/software/cvs/manual/html_chapter/cvs_7.html#SEC40 What a staff did: A staff just did 'cvs commit' as usual. Its log is available at http://ja.openoffice.org/servlets/ReadMsg?list=cvs&msgNo=2330
Created attachment 27980 [details] Illustrates marks of conflicts in the web page.
Instructions might be: cd local_working_directory_for_the_tool cd ja/www mv index.html index.html.backup cvs update index.html
You can help to solve this unexpected phenomenon, can't you?
I've found a similar issue: i47287
Hi, i do not want to blame anyone, but this problem probably comes from a defect in the tool that automatically produces static web pages from HTML source files held in the CVS system. It may be racing. (i am not sure how the tool works. This is my guess.) The tool repeatedly checks out index.html with "cvs update" command. Meantime, the tool checks out the same file with the same command right after a user checks in index.html with "cvs commit" command through ssh ip tunnel. There might be a possibility that two "cvs update" commands concurrently run against the same file index.html. What would happen if racing occurs? One "cvs update" command will attempt to get a revision 1.1 of index.html but the file could be updated by another "cvs update" command that would get a revision 1.2 of index.html during the first "cvs update" command is processing. In that case, the first one will result in the status of conflict and will insert marks of the conflict into the file index.html, which are considered to be solved by hand. Japanese Native Language team has been waiting for prompt actions since last week because it happens in the top page of OpenOffice.org web site. Your help will be greatly appreciated. Best, Tora
See http://ximbiot.com/cvs/manual/cvs-1.11.20/cvs_10.html#SEC84 Thanks
Please forgive me for the escalation from P3 to P2. This issue has been left for a week. Webmaster of ja.openoffice.org has received a number of inquiry and comment from users via e-mail.
raise prio.
st: it is very serious problem for ja.openoffice.org. could you please fix this problem asap or assign to correct person? other projects doesn't seem to suffer from this. thanks!
Sorry for the oversight.I have filed an internal ticket for this issue and our engineers are working on it with the highest priority.Reducing the priority but will keep track of it internally. Thanks. Aarthi-Helpdesk.
The issue ahs been fixed.I have verifed the same.Kindly confirm the same. Thanks. Aarthi-Helpdesk.
Aarthi, Thank you for your help. Now it looks good. Tora
closing...