Merge commits confuse the version detection
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
reno |
Fix Released
|
Medium
|
Doug Hellmann |
Bug Description
When a patch is added with a merge commit where the original patch is authored before a tag, the version detection in reno will be confused and put any release notes
For example look at subunit2sql's commit: http://
This commit was merged after the 1.0.2 tag (as part of the 1.1.0 release) but the original commit's date puts it before the 1.0.2. The way reno does the git log with:
git log --pretty="%x00%H %d" --name-only
will pick up the file being added before the 1.0.2 (and therefore treat it as part of the 1.0.2 release) because it's looking at things via time vs what is actually in the tag. (this snippet from the log output shows that clearly http://
This results in the generated releasenotes being associated with the wrong release:
http://
It's worth pointing out that if you do git logs per tag the log will indicate the proper thing. For example:
http:// paste.openstack .org/show/ 480686/
So it might be better to loop over all the tags in this manner to collect the per tag release notes, and then at the end get the notes for unreleased changes.