Use newer subversion and perform mergemaster -p before installworld