fedora-infra / rpmautospec

#208 Merge commits stop changelog generation
Closed: Fixed by nphilipp. Opened by churchyard.

Closed: Fixed
Reopen Issue

Consider a git commit history like this:

*   1a5f52a 2021-07-19 Miro Hrončok - Merge branch 'yesterdays_pr' into rawhide (HEAD -> rawhide)
|\  
| * e11dc77 2021-07-18 Miro Hrončok - This pull request was opened yesterday (yesterdays_pr)
* | e5c4c7e 2021-07-19 Miro Hrončok - This pull request was opened today (todays_pr)
|/  
* 2add49a 2021-07-09 Fabio Valentini - Update to version 3.1.2; Fixes RHBZ#1980546
* f2a3446 2021-07-09 Fabio Valentini - convert to rpmautospec
...

$ rpmautospec generate-changelog .
* Mon Jul 19 2021 Miro Hrončok <miro@hroncok.cz> 3.1.2-3
- Merge branch 'yesterdays_pr' into rawhide
(ends here, no more entries)

This was rather unexpected.

Hmm, it actually can't continue from a real merge(*) but in this case the changelog entry should read:

- RPMAUTOSPEC: unresolvable merge

(*): A "real merge" is one where the tree of the merge commit is different from all parent trees. In this case the algorithm can't figure out which pieces of the different parent histories are relevant for the changelog. I documented this in the invitation to test, but didn't update the official docs yet, mea culpa!

Metadata Update from @nphilipp:
- Issue tagged with: Bug, Documentation

E.g. with git merge --allow-unrelated-histories?

Ahh, the trees are the same because you really didn't change anything, and it still just stops (instead of following the first parent with the same tree).

E.g. with git merge --allow-unrelated-histories?

Nah, what I described first is what you did (essentially): the merge commit shares its tree with (at least) one parent, which is resolvable and I thought the code did it but as you found out, it doesn't. With "real" merges it's guess work which parts of which history are still applicable, which I consider "unresolvable" as far as changelog generation stops (and would yield the "unresolvable merge" changelog message).

Metadata Update from @nphilipp:
- Issue assigned to nphilipp

Metadata Update from @nphilipp:
- Issue tagged with: Needs Deployment

PR #213 should fix this.

Commit 198ae418 relates to this ticket

Commit b0e15176 fixes this issue
Metadata

Bug Documentation Needs Deployment

None
None
None
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.