DevHeads.net

Concurrent changelogs - merge or nix?

Hello,

For a few months now and in order to help upstreams find bugs and test
new features I have been maintaining in copr development versions of a
couple of my packages, namely pre-release versions of Molsketch and
development snapshots of SciDAVis built against Qt5. At the same time,
I have been updating the packages in Fedora, when there are new,
stable versions and backporting fixes. As a result, the changelogs
have diverged. When it's time to merge the changes in Fedora, how
should I deal with them? Do I copy over the copr changelogs, or do I
just add a single entry for the new releases ignoring all the package
changes in between?

Best regards,
Alex