On Thu, Feb 14, 2013 at 11:56 PM, Ldm Public <[email protected]> wrote: > Ok thanks. > > I have a last question regarding XWiki update process. > > Does the XAR I have installed thru the EM / Advanced Search > "org.xwiki.enterprise:xwiki-enterprise-ui-all" contains absolutely all XWiki > pages? Which means I can "skip" updates for some versions because next XAR > update will be a "full" update. But it also means, when I perform an update > that I'm prompted to solve conflicts for pages which are in the XAR but > which, in fact, didn't changed from an XWiki official distribution point of > view (the only changes in these pages are the changes I've performed). > > Or does the upgrade process is more clever: each page has its own version > and the update process does a comparison between the current page version in > my Wiki and the one coming from the XAR before prompting to solve a confict? > > To put it in a nutshell: does the updated XAR / or the update process > performs an incremental update or does it, potentialy depending on the admin > answers on conflicts, updates all Wiki pages?
Neither :) The upgrade does a 3 ways merge for each page between page in the previous version, page in the database and page in the new version so among other things if the page did not change in the official version it will not do anything for this page. Conflict asking is pretty rare because even if the document changed in official version and you modified some stuff most of the time it's able to merge it properly as long as you did not touch the exact same thing that changed between previous and new version. > > Thanks for your (I hope) last explainations, > > _______________________________________________ > users mailing list > [email protected] > http://lists.xwiki.org/mailman/listinfo/users -- Thomas Mortagne _______________________________________________ users mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/users
