From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by sourceware.org (Postfix) with ESMTPS id BA949385DC0B for ; Thu, 23 Apr 2020 07:35:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BA949385DC0B Received: by mail-lj1-x241.google.com with SMTP id w20so5174361ljj.0 for ; Thu, 23 Apr 2020 00:35:01 -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=qPvEhwa0fzpPHetmXRkKOowjAEmnlqP88o12yVoIeUg=; b=fy0CqvkJyG2/Jm37OssN6a2UILJmvbrQH2cQtJyf5v2v6KOIVfD03/EbqI6ekNL9Bx a5dqWy2M7rcqQB64k73LZGDjer96uK0iGO3sW3IXxEWqllkDsaszcmKzjblClV6WWD6K uyVSUvwzCr5W4sE6/SU1p8aBVEZ3wN6iVCYKvdTPQcL7tkysiUkot15jKFceHy/n4E24 +ClZL6k8W14HEcj0eTewOGqeObn/tv4FaP2mjp7xJ0Z4AL3g0y+j2QiEPXLEe23l74da NuMelNfr3tktBvbgSILOCXEBsXn/kRHr7LtV0q8aWvmlGrDQU29tqPhGcGV3nmDLo42A UGcg== X-Gm-Message-State: AGi0PuanlAng6lSD+xt8M+t03U+pfyEWRimXlvGpqbHBMq0x0qlYyrSJ AC1zFpG2P7FeWjC51uXLlyvg7ufJ6+S1i9NnnsqtD0A2 X-Google-Smtp-Source: APiQypLJp8FjQSPDGw2X/E4Y34qihkb7iFpzkUWrESNqPL0jpclx7V7kkO6DGBReBsPeCniCu+15fUE6frBVrEmBXEU= X-Received: by 2002:a2e:8999:: with SMTP id c25mr1592595lji.73.1587627300587; Thu, 23 Apr 2020 00:35:00 -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: Richard Biener Date: Thu, 23 Apr 2020 09:34:48 +0200 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.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: overseers@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Overseers mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 07:35:03 -0000 On Thu, Apr 23, 2020 at 7:47 AM 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. Btw, I encourage everybody trying to experiment with CI to set it up for release branches first because of the lower check-in count. Richard.