Restore the trunk that existed before the windows changes were committed to the (now moved to branches) old trunk.
temp/
temp_trunk_copy/