Replying to Don-vip:
Hotfixes are quite rare. We must obviously keep this possibility but I agree with can usually skip the .0.
Ok, that's fine then.
As we will need the timestamp information anyway, could we keep @since xxx in the commits and have a git hook replacing xxx by a timestamp when this commit is merged on JOSM master branch? Feasible?
So basically we would not add any version information but in the future, any @since tag simply defines the time at which that feature was merged into master?
The problem with git commit hooks is that they run on the client. They do not run at the server, so the time inserted would be the time that developer committed to his local store and not to the upstream repository. Basically, this is a good thing since it allows us to have mirrors of our main repository.
What might be able to do is use the post-receive hook to create a new automated commit (by a bot) as soon as a feature is merged into master that then updates the since tags.