From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id 2BE253851C39; Thu, 23 Apr 2020 08:34:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2BE253851C39 Received: by mail-il1-x12b.google.com with SMTP id x2so4744319ilp.13; Thu, 23 Apr 2020 01:34:32 -0700 (PDT) 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:cc; bh=bmCl4qk0BkFTY8HbJsagecsmeMMXNZWZZEefgFA+uw0=; b=Nuj2fK66jTA12BQcft4tRXuy5ZYcRGbnZ2PzkJmmCiVR8vTQy5i3rvqD4X+W+hQn6g fqUx1fswHDuBenNql2VIQbc1fdBbtNFJDyOzecv7IRpd5xF9kmpEs9kewOa57AE/3TJM 8AjFyNHEkFAE3c3n92Y2LFIQ9Bc4Y1nCIYQOW0hQeutjphCfVZuFdbU/B/ngB8gqad+8 fAVVZUNccGYSWLtmbMQnc260OAE5m+pL8G+XqwXFWFaHnOizKyf4QLclMRjeFymZJq7Y 0NgDaukKkZ6an0rl0WdSKCParweY7PlSGENQX6GSyh2hZyoK1YFVavG6waP0amss93kv AGDg== X-Gm-Message-State: AGi0PuajND4N9KiLZJeKJwX8Jp+KW/9XaUZJD5DzvhvjUJl2/Yebx70s X6qHI5iU9kYDfoPrmzQZ5eD2cHR5yj01icl4eKk= X-Google-Smtp-Source: APiQypKidPuIFpz0jpjQN8+vLIIvyF8w+rjo2a4HfMovobMZ/y3p7w0pk/yPEHD2rbmZB0wNpDvZRvthxn9Ov9AhOGQ= X-Received: by 2002:a92:50f:: with SMTP id q15mr2430387ile.4.1587630871607; Thu, 23 Apr 2020 01:34:31 -0700 (PDT) MIME-Version: 1.0 References: <20200317194613.GH22482@gate.crashing.org> <20200317195158.GC112952@elastic.org> <874kumt0bh.fsf@mid.deneb.enyo.de> <20200318110109.GA5496@redhat.com> <20200318142239.GF112952@elastic.org> <3af9771e-e577-f2a1-843e-c2b078bfc4ea@t-online.de> <20200318162250.GG112952@elastic.org> <87zhccsdfd.fsf@tromey.com> <87imj0pjbr.fsf@mid.deneb.enyo.de> <87blosphsw.fsf@mid.deneb.enyo.de> <87h7xag3cl.fsf@mid.deneb.enyo.de> In-Reply-To: <87h7xag3cl.fsf@mid.deneb.enyo.de> From: Jonathan Wakely Date: Thu, 23 Apr 2020 09:34:20 +0100 Message-ID: Subject: Re: Not usable email content encoding To: Florian Weimer Cc: Tamar Christina , "overseers@gcc.gnu.org" , Jonathan Wakely via Gcc , Overseers mailing list , Segher Boessenkool , Alexander Monakov , "Frank Ch. Eigler" , "Frank Ch. Eigler" , Tom Tromey Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 08:34:33 -0000 On Thu, 23 Apr 2020 at 06:49, Florian Weimer wrote: > > * 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. I've been having problems with it recently, e.g. https://gcc.gnu.org/g:e76100ced607218a3bf had to fix a changelog, because https://gcc.gnu.org/g:d76925e46fad09fc9be67 put my changelog entry in the wrong place in gcc/testsuite/Changelog, as a result of a rebase using merge-changelog. Maybe we should follow glibc and get rid of ChangeLog files before trying to use automated CI and Git workflows.