Re: This PHP Manual build is broken
| From: | Philip Olson | Date: | Fri, 11 Dec 2020 20:21:27 +0000 |
| Subject: | Re: This PHP Manual build is broken | ||
| References: | 1 2 3 4 5 6 | Groups: | php.doc |
| Request: | Send a blank email to phpdoc+get-969387718@lists.php.net to get a copy of this message | ||
> On Dec 10, 2020, at 9:11 AM, Christoph M. Becker <cmbecker69@gmx.de> wrote:
>
> On 10.12.2020 at 14:57, André L F S Bacci wrote:
>
>> On Thu, Dec 10, 2020 at 1:41 PM Christoph M. Becker <cmbecker69@gmx.de>
>> wrote:
>>
>>> On 10.12.2020 at 14:23, André L F S Bacci wrote:
>>>
>>>> On Thu, Dec 10, 2020 at 12:41 PM Christoph M. Becker <cmbecker69@gmx.de>
>>>> wrote:
>>>>
>>>>> Isn't that fixed with
>>>>>
>>>>> <http://svn.php.net/viewvc?view=revision&revision=351991>?
>>>>> Was that
>>>>> just a glitch of the docs builder?
>>>>>
>>>>
>>>> In my machine, an svn update generated a conflict on en/reference/stats.
>>>> After marking the conflict resolved, and after deleting the entire
>>>> en/reference, an svn update does not recreate the en/reference/stats
>>>> directory. So it's probably a SVN glitch.
>>>
>>> Hmm, I just did a fresh en checkout, and the en/reference/stats
>>> directory is there.
>>>
>>
>> A fresh checkout worked here too. This would be necessary on the build
>> machine.
>
> The issue appears to be resolved somehow.
>
Howdy,
It appears the autogenerated entities.functions.xml file in there caused problems,
so us doing 'svn up' locally didn't resolve the problem (I forget which option I
chose when prompted though). Conflicts exist as we all have that file
autogenerated locally and the commit adding stats/ back committed (added) it
whereas the previous delete didn't delete it (as it's not in svn).
For me, the fix was 'svn revert -R .' inside the stats/ directory as doing so
caused all the files to magically appear.
In any case, I removed stats/entities.functions.xml just now from SVN so
maybe that'll help resolve the issue for some people.
Regards,
Philip