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

Comments

Re: Concurrent changelogs - merge or nix?

By =?ISO-8859-1?Q?... at 03/15/2019 - 05:22

I've been there, keeping Ruby .spec file in sync with upstream
development, and my decision was always to drop the detailed changelog
and replace it just with single entry. In the end, in the development
stream, there are many times mentioned just updates to some snapshots,
temporary workarounds etc. This applies also to the final update, I
prefer to have it in just single commit (typically done just using
`fedpkg import`) instead of merging the branch.

If anybody is interested in details, I used to maintain the changes in
branches, which are kept in the repo. The last development branch is in
my fork in Pagure which I again keep around (may be I should still keep
the development branches instead, dunno).

HTH

Vít

Dne 15. 03. 19 v 8:41 Alexander Ploumistos napsal(a):

Re: Concurrent changelogs - merge or nix?

By Alexander Ploumistos at 03/15/2019 - 06:42

On Fri, Mar 15, 2019 at 10:24 AM Vít Ondruch < ... at redhat dot com> wrote:
Thank you Vit, that seems like the reasonable thing to do in the end.