A slight tangent, but I suggest using a modification history section in the preamble/post-amble. Include the why (bug or requirement id), when, who and a comment. (For who, we use a 3 letter acronym, the users initials, for example. User ids create a security risk.) It also helps to enforce some sort of standard template for this.
While this does cause some merge conflicts, it helps us visually see for example, that a bug fix was merged into a specific branch. However, I understand the desire to know specific version numbers. Good luck! --John
