[xwiki-devs] updating a wiki... yet another reason for source-as-source!

Hello XWikiers, I am trying to sketch a best scenario for the update of our curriki derivative. As is common in most xwiki-based sites, i2geo is based on a distribution that builds from a multi-module source-directory into a web-archive and an xwiki-archive. What's in the xwiki archive and in the web-archive is tuned by installers. These tunes need to be brought back to source: for webapp changes it's often easy, for wiki-pages changes it is a matter of xar export and expansion in principle. Now comes the time to update because curriki has released anew. How can I do it? Ideally simply run svn update on the source which has been brought back of all changes and rebuild and redeploy. Generally there will be conflicts and they should be address individually. For the xwiki documents this is highly uncomfortable and this speaks again in favour of detached source-files in xwiki sources: the svn update should update the source code of documents as a source and conflicts should be solved there. Any advance in this direction? paul