On Thu, Jun 9, 2011 at 14:33, Philip Olson <phi...@roshambo.org> wrote: > > On Jun 9, 2011, at 4:12 AM, Ford, Mike wrote: > >> This all went through the edit.php.net online editor, so I'm not quite sure >> what the problem is -- if something didn't work quite right, this might be >> indicative of a bug in PhD OE rather than anything else... or maybe I >> committed the newbie mistake of not reading everything I should? >> >>> -----Original Message----- >>> From: Peter Cowburn [mailto:petercowb...@gmail.com] >>> Sent: 09 June 2011 11:55 >>> To: Mike Ford >> >>> It looks like you forgot to svn update before committing the new >>> changes below. >> >> This all went through the edit.php.net online editor, so I'm not quite sure >> what the problem is -- if something didn't work quite right, this might be >> indicative of a bug in PhD OE rather than anything else... although it might >> be a bug in my brain, also! Or maybe I committed the newbie mistake of not >> reading everything I should? > > I think the online editor has a problem here, and that it should be reported. > Please open a bug report. The editor should be aware of this situation, > because I'm unsure how it would happen as a conflict should have been > reported (to you) before allowing the second commit. > > And the scenario is someone making changes between edits, as Peter altered > the text two minutes after your commit, but your next commit was a couple > hours later.
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. Out of the brazillion files available, I don't think this case happens that often, unless people leave wip files alone for a long period of time - it should ofcourse be looked into and fixed. -Hannes
