Re: [Phpwiki-talk] Upgrading from wiki 1.2.X, is this a bug or new behaviour?

[Reini U. <ru...@x-...>]

joel schaubert schrieb:
> I've just finished upgrading two wiki sites from 1.2.x to 1.3.12_rc1.
> (one windows, one gentoo)
> The upgrade went quite well but there is a new behaviour during the load
> process that deviates from the old proceedure.
> 
> During the upload, the message will sometimes say "merge conflict" and
> not load the new page. This means two things

You can "Load & Override" to overcome such conflicts. But better is to
handle all conflicts individually.

> 1) the "base" wiki pages like home page and admin pages no longer need
> to be "fixed up" as stated in the 1.2.x section of the UPGRADING file
> 
> 2) if you do a dump (all revisions) instead of a snapshot (latest
> revision only) then it seems to take an older version of your pages and
> then NOT load the newer version of your page.   So I think either there
> is a bug, or this is a new behaviour and the upgrading instructions
> should be updated.

The importer looks at the Date header of the page. In the wikidb against
the creation date of the pgsrc, you want to import.
If you changed your pages after I changed the pgsrc pages, they will not
be upgraded.

> If someone can tell me that this is not a bug and is intended, then I
> will offer to update the 1.2.x section of the UPGRADING file and submit
> a patch since both of my upgrades are working fine now and my proceedure
> could be documented for others.

Thanks. I added some more text to UPGRADING.
-- 
Reini Urban
http://phpwiki.org/
http://helsinki.at/  http://spacemovie.mur.at/