> -----Original Message-----
> From: Hannes Magnusson [mailto:hannes.magnus...@gmail.com]
> Sent: 09 June 2011 14:31
> To: Philip Olson; PHP Documentation ML
> Cc: Ford, Mike; Peter Cowburn; doc-...@lists.php.net
> Subject: Re: [DOC-CVS] svn: /phpdoc/en/trunk/language/ operators.xml
> 
> 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:
> >
> >>> -----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.

Yes, that would explain it -- for my later edits, I opened the file and
started  to edit it, then got called away for an hour before coming back
to finish off and commit; plenty of time for an intervening commit to
throw things off.

Bug report: http://bugs.php.net/bug.php?id=55016

Cheers!

Mike

 -- 
Mike Ford,
Electronic Information Developer, Libraries and Learning Innovation,  
Leeds Metropolitan University, C507 City Campus, 
Portland Way, LEEDS,  LS1 3HE,  United Kingdom 
E: m.f...@leedsmet.ac.uk     T: +44 113 812 4730






To view the terms under which this email is distributed, please go to 
http://disclaimer.leedsmet.ac.uk/email.htm

Reply via email to