*** vc-version-diff (C-u C-x v =) now suggests reasonable defaults for version numbers, based on the current state of the file.