Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #65444

Merge request friendly handling of debian/changelog

Cross-posted to 2 groups.

Show all headers | View raw

Moin

In Debian most people prefer to have changelog entries with all changes,
so changes always contain a modification to debian/changelog.

If we also start to use merge requests on Salsa, all those changes will
contain modifications to debian/changelog, which will usualy conflict
with each other.  Or worse, are applied to an old changelog entry.  This
for example happens on the linux packaging project.

I don't think we already have a way to get around this?  Do we need
some?

There is "gbp dch", which ignores merge commits (so no really good for
merge requests), but I don't consider it to have enough control over the
content of the changelog.

The way that for example GitLab chooses in many locations is to create
split files and merge them together in the final release process.  They
now not only use that for the core software changelog[1], but also for
stuff like release posts.

So one rough idea could be:
- "dch $message" writes a dummy entry to debian/changelog if it does not
  exist and the entry to debian/changelog-unreleased/$hash.
- "dch --release" collects the snippets and creates one large entry.

Regards,
Bastian

[1]: https://docs.gitlab.com/ee/development/changelog.html
-- 
One does not thank logic.
		-- Sarek, "Journey to Babel", stardate 3842.4

Back to linux.debian.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Merge request friendly handling of debian/changelog Bastian Blank <waldi@debian.org> - 2019-10-22 05:10 +0200
  Re: Merge request friendly handling of debian/changelog Joseph Herlant <aerostitch@debian.org> - 2019-10-22 06:10 +0200
  Re: Merge request friendly handling of debian/changelog Sam Hartman <hartmans@debian.org> - 2019-10-22 13:40 +0200
    Re: Merge request friendly handling of debian/changelog gregor herrmann <gregoa@debian.org> - 2019-10-22 14:00 +0200
    Re: Merge request friendly handling of debian/changelog Guido Günther <agx@sigxcpu.org> - 2019-10-25 21:00 +0200
  Re: Merge request friendly handling of debian/changelog Jeremy Bicha <jbicha@debian.org> - 2019-10-22 20:40 +0200
  Re: Merge request friendly handling of debian/changelog Simon Richter <sjr@debian.org> - 2019-10-23 14:40 +0200

csiph-web