Re: Merge request friendly handling of debian/changelog

Path	csiph.com!4.us.feeder.erje.net!2.eu.feeder.erje.net!3.eu.feeder.erje.net!feeder.erje.net!weretis.net!feeder7.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Jeremy Bicha <jbicha@debian.org>
Newsgroups	linux.debian.devel, linux.debian.kernel
Subject	Re: Merge request friendly handling of debian/changelog
Date	Tue, 22 Oct 2019 20:40:01 +0200
Message-ID	<yU7ex-39y-3@gated-at.bofh.it> (permalink)
References	<yTSIx-2Kf-1@gated-at.bofh.it>
X-Mailbox-Line	From debian-devel-request@lists.debian.org Tue Oct 22 18:31:50 2019
Old-Return-Path	<jeremy@bicha.net>
X-Amavis-Spam-Status	No, score=-6.752 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, HEADER_FROM_DIFFERENT_DOMAINS=0.249, LDO_WHITELIST=-5, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001] autolearn=unavailable autolearn_force=no
X-Policyd-Weight	NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .bicha. - helo: .mail-vk1-f179.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -5.5
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=mDYmFdut4qfcWO6Zw9DNdUHOv/vpcQFWuA6hpBkTwU8=; b=efrkqOsUlBqjWh6oY4/awRrFdjw3kgy2EyCi5e5jbPkje80TiSOPzBfJhaFEaVGYHR JKk2RcS56VnYcm8RVPhcX8AHPdjcxTL0T+z+McgUCB3Q9wswIxN71S1G7B0cKzTLMy6i NrwUhXuiDKH1D25FkVnkWHsnbTHnct46URZ+rFnJUdlCDARQWKX8tbdcxCBEc5UQfM/j 8ZxBgESxY7EzfNkotG0qBt835VUEenTOCIwAzVfTHHudHkM75HAZM0AGFoy6D4hPdbKo 00iU0wda8wulRj9BpO0wTWtR6+dcCu3stG+MxnVx8dWMZ+XE0RC9k9ZIszEMZ9gM+Y9w rOBQ==
X-Gm-Message-State	APjAAAW9dcTUdr9ukfTqBbVs4xs2pidMxNsxCVPwGSlLL/aghz/GCl1X ffk5TFgFdz93PSIejnMpzIn7eI/qHts=
X-Google-SMTP-Source	APXvYqxGr00cKyvIe72RMzm3akWn03+Mtr/imkZOnRUNvQw8DOvp8QEd3ZZyhfZj4T+HiSRt7Zewlg==
X-Received	by 2002:a1f:a5ca:: with SMTP id o193mr2680660vke.34.1571769093560; Tue, 22 Oct 2019 11:31:33 -0700 (PDT)
X-Received	by 2002:ab0:d8c:: with SMTP id i12mr2897223uak.57.1571769092777; Tue, 22 Oct 2019 11:31:32 -0700 (PDT)
MIME-Version	1.0
X-Gmail-Original-Message-ID	<CAAajCMY0JqEPrUyKaS33g49kxtoOOduUALcN3frg=-77SLBh0w@mail.gmail.com>
Content-Type	text/plain; charset="UTF-8"
X-Mailing-List	<debian-devel@lists.debian.org> archive/latest/341143
List-ID	<debian-devel.lists.debian.org>
List-URL	<https://lists.debian.org/debian-devel/>
List-Archive	https://lists.debian.org/msgid-search/CAAajCMY0JqEPrUyKaS33g49kxtoOOduUALcN3frg=-77SLBh0w@mail.gmail.com
Approved	robomod@news.nic.it
Lines	9
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Tue, 22 Oct 2019 14:30:56 -0400
X-Original-Message-ID	<CAAajCMY0JqEPrUyKaS33g49kxtoOOduUALcN3frg=-77SLBh0w@mail.gmail.com>
X-Original-References	<20191022024753.kcyj2exovbqcx3jt@shell.thinkmo.de>
Xref	csiph.com linux.debian.devel:93900 linux.debian.kernel:65454

Cross-posted to 2 groups.

Show key headers only | View raw

On Mon, Oct 21, 2019 at 11:06 PM Bastian Blank <waldi@debian.org> 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,
Jeremy

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