[Systems] wiki-devel.sugarlabs.org/
Sebastian Silva
sebastian at fuentelibre.org
Tue May 27 11:48:00 EDT 2014
Contrary to the previous errors, this one doesn't seem to leave a trace
at
/var/log/apache2/wiki-devel.sugarlabs.org/wiki-devel.sugarlabs.org-error.log
Not sure where to look from here, sorry.
Perhaps replace db with a dump from production instance?
Regards,
Sebastian
El mar, 27 de may 2014 a las 10:42 AM, Sebastian Silva
<sebastian at fuentelibre.org> escribió:
> I had already done that.... I'll take a look.
>
> Regards,
> Sebastian
>
> El mar, 27 de may 2014 a las 10:37 AM, Bernie Innocenti
> <bernie at codewiz.org> escribió:
>> Sebastian, we probably need to run maintenance/update.php.
>>
>> On 05/27/2014 11:34 AM, Frederick Grose wrote:
>>> On Tue, May 27, 2014 at 2:23 AM, Bernie Innocenti
>>> <bernie at codewiz.org
>>> <mailto:bernie at codewiz.org>>wrote:
>>>
>>> On 05/27/2014 01:51 AM, Sebastian Silva wrote:
>>> > Hi,
>>> > I had hoped to look at this sooner, sorry for the delay.
>>> >
>>> > Looks like somebody applied a patch to the wiki-devel
>>> instance,
>>> and did
>>> > not finish manually merging some conflicting lines:
>>> >
>>> > icarito at sunjammer:/srv/www-sugarlabs/wiki-devel$ grep
>>> "<<<<<<"
>>> */*.php -Rn
>>> > includes/Article.php:59:<<<<<<< HEAD
>>> > includes/Article.php:746:<<<<<<< HEAD
>>> > includes/EditPage.php:2613:<<<<<<< HEAD
>>> > includes/EditPage.php:2632:<<<<<<< HEAD
>>> > includes/Revision.php:1231:<<<<<<< HEAD
>>> >
>>> > I've attached the full diff.
>>> >
>>> > I resolved the confict manually, picking the version from
>>> upstream. But
>>> > it starting showing issues so finally I aborted the conflict
>>> resolution
>>> > and stashed the merge.
>>> >
>>> > This produced a working wiki-devel.
>>>
>>>
>>> Thank you!
>>>
>>> Unfortunately, I get this error report on trying to save a page
>>> change:
>>>
>>>
>>> Database error
>>>
>>>
>>> <http://wiki-devel.sugarlabs.org/index.php?title=Category:Under_construction&action=submit#mw-head><http://wiki-devel.sugarlabs.org/index.php?title=Category:Under_construction&action=submit#p-search>
>>> A database query syntax error has occurred. This may indicate a
>>> bug in
>>> the software. The last attempted database query was:
>>>
>>> (SQL query hidden)
>>>
>>> from within function "RecentChange::save". Database returned error
>>> "1054: Unknown column 'rc_moved_to_ns' in 'field list'
>>> (localhost)".
>>>
>>> --Fred
>>>
>>>
>>> _______________________________________________
>>> Systems mailing list
>>> Systems at lists.sugarlabs.org
>>> http://lists.sugarlabs.org/listinfo/systems
>>>
>>
>>
>> --
>> _ // Bernie Innocenti
>> \X/ http://codewiz.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/private/systems/attachments/20140527/5fa78f66/attachment.html>
More information about the Systems
mailing list