Bug #55016 [Asn]: PhD OE failure to detect commit clash

Edit report at https://bugs.php.net/bug.php?id=55016&edit=1 ID: 55016 Updated by: philip@php.net Reported by: mgf@php.net Summary: PhD OE failure to detect commit clash Status: Assigned Type: Bug Package: Online Doc Editor problem PHP Version: Irrelevant Assigned To: yannick Block user comment: N Private report: N New Comment: One problem here is the diff/patch ends up looking incorrect. For example, one such diff contains this: -<!-- $Revision: 310734 $ --> -<!-- EN-Revision: 310390 Maintainer: simp Status: ready --> +<!-- $Revision: 305441 $ --> +<!-- EN-Revision: 301404 Maintainer: simp Status: ready --> That needs to be addressed. I'm too scared to test your theory and press "commit" though :), but it sounds like the commit will fail? However, how that diff was generated (The +Revision is old compared to the -Revision) is a question we must explore. Previous Comments: ------------------------------------------------------------------------ [2011-06-14 16:15:24] yannick@php.net When we try to commit a file via the editor, the processus is : 1) we "svn up" each file to search if the file haven't been modified since last update processus ( http://svn.php.net/viewvc/web/doc-editor/trunk/php/RepositoryManager.php?revision=309774&view=markup , line 1070, call beforeCommitChanges() method ) 2) if the file have been modified since last update processus, we don't commit it, and delete pending work. This processus can be view here : http://svn.php.net/viewvc/web/doc-editor/trunk/php/RepositoryManager.php?revision=309774&view=markup , line 841 to 853 ------------------------------------------------------------------------ [2011-06-09 15:52:06] mgf@php.net Description: ------------ Scenario: a file was opened for editing in the online editor, and then held open for an extended period; when eventually committed, an intervening commit by another user was reverted without any clash warning. Explanation from Hannes on the phpdoc list: > The editor saves full files, not patchsets. > AFAICT, once you start working on a file it isn't synced with svn at > any point. Then on commit, the wip file is copied over the original > one, overwriting any changes happened since the work started and > commits it - hence not creating conflicts. ------------------------------------------------------------------------ -- Edit this bug report at https://bugs.php.net/bug.php?id=55016&edit=1