One would think that this is an easy task, but it turns
out that subversion has many problems when merging back and forth
with deleted or added files. This needed a lot more manual
polishing than exspected.

[[Imported from SVN: r7441]]