Matthew Dillon is adding versioning support to Hammer; it’ll support in-place version upgrading.  The gory details of his current plan are available, with an interesting tidbit: Hammer directory lookups remain the same speed even with 2 billion files in a directory, while UFS will be O(N^3) speed after several hundred thousand.