-cat - >> $TMP <<- EOF
- CVS: Remove "CVS:" from start of lines that should be in commit message
- CVS: did you update the ChangeLog for a bug fix?
- CVS: did you update the hours spent in Bugzilla?
- CVS: did you verify/update the HLD/DLD in CVS?
- CVS: b=<bug>
- CVS: r=<reviewed_by>
-EOF
+ # We can't just put these into the commit template without the leading
+ # "CVS: ", otherwise exiting the commend edit would still leave a valid
+ # comment in the file and the commit will still be done. We need to
+ # make a file without valid comments to allow the commit to be aborted.
+ cat - >> $TMP <<- EOB
+ CVS: b=<bug>
+ CVS: i=<inspected_by>
+ CVS: i=<inspected_by>
+ EOB