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

From: Date: Thu, 09 Jun 2011 13:52:07 +0000
Subject: Bug #55016 [NEW]: PhD OE failure to detect commit clash
Groups: php.doc.bugs 
Request: Send a blank email to doc-bugs+get-6715@lists.php.net to get a copy of this message
From: Operating system: PHP version: Irrelevant Package: Online Doc Editor problem Bug Type: Bug Bug description:PhD OE failure to detect commit clash 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 bug report at http://bugs.php.net/bug.php?id=55016&edit=1 -- Try a snapshot (PHP 5.2): http://bugs.php.net/fix.php?id=55016&r=trysnapshot52 Try a snapshot (PHP 5.3): http://bugs.php.net/fix.php?id=55016&r=trysnapshot53 Try a snapshot (trunk): http://bugs.php.net/fix.php?id=55016&r=trysnapshottrunk Fixed in SVN: http://bugs.php.net/fix.php?id=55016&r=fixed Fixed in SVN and need be documented: http://bugs.php.net/fix.php?id=55016&r=needdocs Fixed in release: http://bugs.php.net/fix.php?id=55016&r=alreadyfixed Need backtrace: http://bugs.php.net/fix.php?id=55016&r=needtrace Need Reproduce Script: http://bugs.php.net/fix.php?id=55016&r=needscript Try newer version: http://bugs.php.net/fix.php?id=55016&r=oldversion Not developer issue: http://bugs.php.net/fix.php?id=55016&r=support Expected behavior: http://bugs.php.net/fix.php?id=55016&r=notwrong Not enough info: http://bugs.php.net/fix.php?id=55016&r=notenoughinfo Submitted twice: http://bugs.php.net/fix.php?id=55016&r=submittedtwice register_globals: http://bugs.php.net/fix.php?id=55016&r=globals PHP 4 support discontinued: http://bugs.php.net/fix.php?id=55016&r=php4 Daylight Savings: http://bugs.php.net/fix.php?id=55016&r=dst IIS Stability: http://bugs.php.net/fix.php?id=55016&r=isapi Install GNU Sed: http://bugs.php.net/fix.php?id=55016&r=gnused Floating point limitations: http://bugs.php.net/fix.php?id=55016&r=float No Zend Extensions: http://bugs.php.net/fix.php?id=55016&r=nozend MySQL Configuration Error: http://bugs.php.net/fix.php?id=55016&r=mysqlcfg

« previous php.doc.bugs (#6715) next »