renames are versioned (through versioning of directories) and that renames get merged. <http://www.highley-recommended.com/sw_process/best.html> also seems to confirm this. (I've never used either, so take that with a few grains of salt :) Gerhard