With svn (http://pubsv.ez.no) you can modify files, when you update, it keeps your modifications and does a rather good job if it needs to merge your modifications with ez ones.
about SVN: How do you think exactly this could be done? I know about merging possibilities of source-code-management systems, but wouldn't I have to set my own then? I can't imagine that it could be possible to put my own modifications in in SVN on ez.no - or am I wrong?