From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fw@deneb.enyo.de>
Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21])
 by sourceware.org (Postfix) with ESMTPS id 40B0A385DC32;
 Thu, 23 Apr 2020 05:48:00 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 40B0A385DC32
Received: from [172.17.203.2] (helo=deneb.enyo.de)
 by albireo.enyo.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
 id 1jRUiI-00063V-BY; Thu, 23 Apr 2020 05:47:54 +0000
Received: from fw by deneb.enyo.de with local (Exim 4.92)
 (envelope-from <fw@deneb.enyo.de>)
 id 1jRUiI-0007ie-86; Thu, 23 Apr 2020 07:47:54 +0200
From: Florian Weimer <fw@deneb.enyo.de>
To: Tamar Christina <Tamar.Christina@arm.com>
Cc: Richard Biener <richard.guenther@gmail.com>,
 "overseers\@gcc.gnu.org" <overseers@gcc.gnu.org>,
 Jonathan Wakely via Gcc <gcc@gcc.gnu.org>,
 Overseers mailing list <overseers@sourceware.org>,
 Segher Boessenkool <segher@kernel.crashing.org>,
 Alexander Monakov <amonakov@ispras.ru>, "Frank Ch. Eigler" <fche@elastic.org>,
 "Frank Ch. Eigler" <fche@redhat.com>, Tom Tromey <tom@tromey.com>
Subject: Re: Not usable email content encoding
References: <caf17b7a-e198-8885-d306-ab8285d02d72@suse.cz>
 <alpine.LNX.2.20.13.2003161650490.15005@monopod.intra.ispras.ru>
 <20200317194613.GH22482@gate.crashing.org>
 <20200317195158.GC112952@elastic.org>
 <874kumt0bh.fsf@mid.deneb.enyo.de> <20200318110109.GA5496@redhat.com>
 <alpine.LSU.2.21.2003181415360.30534@wotan.suse.de>
 <20200318142239.GF112952@elastic.org>
 <3af9771e-e577-f2a1-843e-c2b078bfc4ea@t-online.de>
 <20200318162250.GG112952@elastic.org>
 <alpine.LSU.2.21.2003181638490.30534@wotan.suse.de>
 <CAFyWVaZfY-CfXwsTwrF8LduSBMYdFecD3x7MLP0ZYb8pC5qZPA@mail.gmail.com>
 <CAH6eHdQe5PdRe42BFeN4e9Ms9jy5Lb2R==FxENbD1TWnefnekA@mail.gmail.com>
 <87zhccsdfd.fsf@tromey.com> <87imj0pjbr.fsf@mid.deneb.enyo.de>
 <CAFiYyc1q6wBHOfCu2tuPj+bXCQyLfmve0iACVYZghve2GMfoaQ@mail.gmail.com>
 <87blosphsw.fsf@mid.deneb.enyo.de>
 <PR2PR08MB47473ECD0B20FFC0D2EF576BFFD30@PR2PR08MB4747.eurprd08.prod.outlook.com>
Date: Thu, 23 Apr 2020 07:47:54 +0200
In-Reply-To: <PR2PR08MB47473ECD0B20FFC0D2EF576BFFD30@PR2PR08MB4747.eurprd08.prod.outlook.com>
 (Tamar Christina's message of "Thu, 23 Apr 2020 00:54:04 +0000")
Message-ID: <87h7xag3cl.fsf@mid.deneb.enyo.de>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS,
 SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: overseers@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Overseers mailing list <overseers.sourceware.org>
List-Unsubscribe: <http://sourceware.org/mailman/options/overseers>,
 <mailto:overseers-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/overseers/>
List-Post: <mailto:overseers@sourceware.org>
List-Help: <mailto:overseers-request@sourceware.org?subject=help>
List-Subscribe: <http://sourceware.org/mailman/listinfo/overseers>,
 <mailto:overseers-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2020 05:48:01 -0000

* Tamar Christina:

> A bit late to the party, but this really doesn't work that well
> because until recent version of gitlab there was no fairness
> guarantee.  another patch could be approved after mine (with hours
> in between because of CI) and yet still get merged first causing my
> own patch to no longer apply, you'd rebase and roll the dice again.
> To fix this they added merge trains
> https://docs.gitlab.com/ee/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/
>
> but trains for GCC Will likely be very short because of Changelog
> conflicts.  So I don't think an automated merge workflow would work
> for projects where every single commit changes the same files.

I had not thought about that.

Does Gitlab support pluggable merge helpers?  The gnulib changelog
auto-merger did a great job when we were still writing changelogs for
glibc.