[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    Re: [DOC-CVS] svn: /phpdoc/en/trunk/ language-snippets.ent
From:       Philip Olson <philip () roshambo ! org>
Date:       2012-07-31 19:37:46
Message-ID: F64066AC-5DB0-4486-A55A-CEAB4EC7163E () roshambo ! org
[Download RAW message or body]


On Jul 31, 2012, at 11:29 AM, Pieter Hordijk wrote:

>> Tuesday, July 31, 2012 7:09:10 PM "Yannick Torrès" <yannick.torres@gmail.com>
>> 
>> 2012/7/31 Philip Olson < philip@roshambo.org > 
>> 
>> On Jul 31, 2012, at 7:49 AM, Yannick Torrès wrote: 
>> 
>>> 2012/7/31 Peter Cowburn < petercowburn@gmail.com > 
>>> 
>>>> On 31 July 2012 15:32, Yannick Torrès < yannick.torres@gmail.com > wrote: 
>>>>> Just an information : The online editor don't sync automatically for an 
>>>>> obscure raison. 
>>>>> 
>>>>> It's the raison that the last change have been wiped out :/ 
>>>>> 
>>>> 
>>>> Thanks Yannick, though that really doesn't help at all. Do you know 
>>>> what the problem is? 
>>>> 
>>> 
>>> I just don't know why.... the script who update the SVN + apply all tools 
>>> over the documentation is run by cron each day. 
>>> The script run "normally", no error output, but the SVN is not updated. 
>>> When I run the same script manually, with the same user (apache), SVN is 
>>> updated, tools applied, all without any error.... 
>> 
>> I also wonder how it makes the commit without showing the SVN conflict. I'd 
>> expect manual intervention to be required before overwriting (reverting) a 
>> previous SVN commit. 
>> 
>> 
>> Before a commit is done, the editor check the svn revision with the "current" revision. 
>> If the revision isn't egal, the commit is aborded. 
>> 
>> This check is an SVN command (update), and if this commit is done, this command is on error too. 
>> 
>> 
>> Regards, 
>> Philip 
> 
> What does this mean for committing using the online editor? Don't do it while this isn't solved?
> 
> Because I still don't have a clue what I did wrong or more important how to prevent it :-)

You did nothing wrong as it's an online editor bug. Well there are two:

  1. It somehow reverts/overrides previous SVN commits without warning
  2. It doesn't remain updated from SVN

Personally, I think the online editor is better suited for translations
than edits to en/ (aside from occasional patches), so recommend you edit 
locally.

Regards,
Philip

P.S. Pieter, your email client does some strange quoting. It 
     merged Yannick and I into one person! I like Yannick, but 
     we are two people :)


--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]