Re: Merge request friendly handling of debian/changelog

2019-10-25 Thread Guido Günther
Hi, On Tue, Oct 22, 2019 at 07:35:55AM -0400, Sam Hartman wrote: > I agree that better handling of things like debian/changelog is > something we should focus effort on. > > I think we can either do something gbp dch like, possibly allowing > commits to annotate whether and to what extent they

Re: Merge request friendly handling of debian/changelog

2019-10-23 Thread Simon Richter
Hi, On Tue, Oct 22, 2019 at 04:47:53AM +0200, Bastian Blank wrote: > In Debian most people prefer to have changelog entries with all changes, > so changes always contain a modification to debian/changelog. It's worse than that: changelogs are supposed to contain the linear history of the branch

Re: Merge request friendly handling of debian/changelog

2019-10-22 Thread Jeremy Bicha
On Mon, Oct 21, 2019 at 11:06 PM Bastian Blank wrote: > 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. Just set your merge settings per project to fast-forward. Thanks,

Re: Merge request friendly handling of debian/changelog

2019-10-22 Thread gregor herrmann
On Tue, 22 Oct 2019 07:35:55 -0400, Sam Hartman wrote: > Or some code that knows how to merge changelogs dpkg-mergechangelogs(1) is a nice helper for some of the merge situations. Cheers, gregor -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' :

Re: Merge request friendly handling of debian/changelog

2019-10-22 Thread Sam Hartman
I agree that better handling of things like debian/changelog is something we should focus effort on. I think we can either do something gbp dch like, possibly allowing commits to annotate whether and to what extent they should be included in changelog. Or some code that knows how to merge

Re: Merge request friendly handling of debian/changelog

2019-10-21 Thread Joseph Herlant
Hi Bastian, Full disclaimer: I probably don't contribute often enough inside Debian to be a reference on it but thinking about it I'm wondering if it wouldn't be easier to do it another way. On Mon, Oct 21, 2019 at 8:06 PM Bastian Blank wrote: > There is "gbp dch", which ignores merge commits

Merge request friendly handling of debian/changelog

2019-10-21 Thread Bastian Blank
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