Loading...
 
Architecture / Installation

Architecture / Installation


Update... troubles

posts: 8311 Israel

Hello i have update Tiki Branch 1.9

I have resolved lot of problems but while looking for merges problems (grep <<<<<<<) i found that those files got problems;

./db/tiki-1.9-mysql.sql
./db/tiki-1.9-oci8.sql
./db/tiki-1.9-pgsql.sql
./db/tiki-1.9-sqlite.sql
./db/tiki-1.9-sybase.sql
./db/tiki.sql
./doc/devtools/tikimerge.sh
./lang/fr/.#language.php.1.147.2.39
./lib/Date/index.php
./lib/webmail/tikimaillib.php
./templates/tiki-contact.tpl
./templates/tiki-top_bar.tpl ./templates/.#tiki-contact.tpl.1.6.10.2
./templates/.#tiki-top_bar.tpl.1.28.2.3


If i have already edit some .php, what about .sql, .tpl or sh.

I can correct them the same way or it should more dangerous ??

posts: 2881 United Kingdom

Latest 1.9 from CVS is broken due to a recent merge, there are a lot of stangeness in the code at the moment.

Damian