From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70051.outbound.protection.outlook.com [40.107.7.51]) by sourceware.org (Postfix) with ESMTPS id 5A3AD3851C06 for ; Thu, 23 Apr 2020 09:55:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5A3AD3851C06 Received: from DB6PR0402CA0022.eurprd04.prod.outlook.com (2603:10a6:4:91::32) by AM4PR08MB2916.eurprd08.prod.outlook.com (2603:10a6:205:e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Thu, 23 Apr 2020 09:55:28 +0000 Received: from DB5EUR03FT063.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:91:cafe::89) by DB6PR0402CA0022.outlook.office365.com (2603:10a6:4:91::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Thu, 23 Apr 2020 09:55:28 +0000 Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT063.mail.protection.outlook.com (10.152.20.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.18 via Frontend Transport; Thu, 23 Apr 2020 09:55:27 +0000 Received: ("Tessian outbound ecb846ece464:v53"); Thu, 23 Apr 2020 09:55:27 +0000 X-CR-MTA-TID: 64aa7808 Received: from a493831d3258.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 05177AE0-F180-40BE-B854-A3878E2A9DEE.1; Thu, 23 Apr 2020 09:55:22 +0000 Received: from FRA01-PR2-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a493831d3258.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 23 Apr 2020 09:55:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F+4Vule6OwjB5RFPbmfE9PDIMgTX8lvpZwARqP8yvdwito1nED+5qoiOG8jnf8FtiGlkZ/uNGlk/vXUE/8GdVFDQTIYRmTGmfnrHqNci93KKnwC2Nzmkp823CgrK/GAB1HYMDlFwH8T+1LuPORbku/M61TM9D3Jf16ndF9xIwnqPebiuZ0J+1TlBc1pEYfib8cMsllNMOIAQ2tHC8MvVbPcjoro/oNI16H0ckPrpd23bpmuCVjmgF6PIcBYI10tkNIenGxYn2A+ErHmIdWeXcQbdnoSs6CzyIgoYfSRt1pDMIDwtkXzQd4W8hsWbIuuxuZGbmjTyrnpw83ds1b/G3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3MVstQIR3VoPrhBDrkpbBE2YSPJt8l9lAjLHEO8rOIc=; b=Niodk+8uBCfEFd+cQ3NOfQSlf6uYn+VUhlMLv4E1YT+REedLkwxzXLIAr/JUJwUtV1C52p1KtX9kkzTJxHDpGx1NgBqbK1vHK+PNrs/VKTpFLduRROv/rW4cwle3DTL8ME7Slcwdboz0BqPX5V3BHx3rUdwKO44vL251NrEPBc+kAwPoooKPqBe9KHHlboyRCAfIoOP96UFTcd9To1mraj7OtvEWnsRXmOn8vvFKEnf3vHO6rr6CWXb274dJedc9aT0C96Bmr+AeM1hRY4BuVWCz8syGJuE9dLoUBQX/kidjEqPOtE7KgfoEUDEiYdlBTDjQcMqCxFZdHIUT4etjGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from PR2PR08MB4747.eurprd08.prod.outlook.com (2603:10a6:101:28::10) by PR2PR08MB5225.eurprd08.prod.outlook.com (2603:10a6:101:1c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Thu, 23 Apr 2020 09:55:21 +0000 Received: from PR2PR08MB4747.eurprd08.prod.outlook.com ([fe80::6815:44:81f2:2283]) by PR2PR08MB4747.eurprd08.prod.outlook.com ([fe80::6815:44:81f2:2283%7]) with mapi id 15.20.2921.030; Thu, 23 Apr 2020 09:55:21 +0000 From: Tamar Christina To: Florian Weimer CC: Richard Biener , "overseers@gcc.gnu.org" , Jonathan Wakely via Gcc , Overseers mailing list , Segher Boessenkool , Alexander Monakov , "Frank Ch. Eigler" , "Frank Ch. Eigler" , Tom Tromey Subject: RE: Not usable email content encoding Thread-Topic: Not usable email content encoding Thread-Index: AQHV+5ko4Hl/tZoXYEmVhGzFgXhR4KhLPbqAgAH0gYCAAAGbAIAA+ES9gAAFwoCAADdvgIAAAN2AgAAOxQCAABLQAIAABWqAgABWngCAAAqKgIAA9LnGgAAGKAmAAAOwgIAABYEIgDYjNUCAAFS2EYAAQt+g Date: Thu, 23 Apr 2020 09:55:21 +0000 Message-ID: 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> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 812b7f55-c673-44c3-81aa-969e9db38707.1 x-checkrecipientchecked: true Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=Tamar.Christina@arm.com; x-originating-ip: [82.24.248.186] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5ff22c83-1d51-49a4-df8f-08d7e76c7394 x-ms-traffictypediagnostic: PR2PR08MB5225:|AM4PR08MB2916: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:10000;OLM:10000; x-forefront-prvs: 03827AF76E X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR2PR08MB4747.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(39860400002)(136003)(346002)(366004)(396003)(376002)(2906002)(6506007)(66946007)(26005)(4326008)(7416002)(8676002)(71200400001)(54906003)(66476007)(66446008)(64756008)(8936002)(81156014)(66556008)(316002)(9686003)(55016002)(186003)(5660300002)(86362001)(7696005)(478600001)(966005)(52536014)(6916009)(76116006)(33656002); DIR:OUT; SFP:1101; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 0QkfbYGj7bVKFE5RzRzJZ0zPCSJGc/5L0nziEWQCNZEEKcX9qdQsQUfV8HEgyfqFy508y7m3eQCSGC9IbdRyMxMUwnZCUO0gzpJBf5pO84wdG8dJf0Hr15KDHpl861nX8IDyK6nUvkh1A8vTTlknevUX+2M/tiROoR4sWa5DqKaigP6GIMTjSjEA9Q5i+TmKKzKT8eOwDIoLGlkBRuh3iX7X4H6PS6yLWyCld/LWni0wOyo+dY52zz325FAjVwFbHqJ0nmBYbtbctd7h66VQTT9gxYaGn0rzx4wVTFQUtxgpvPq0YFKukbL0VaqXMtH3h4cBOssn3akkcP6Pci+7ZMEsru1ur0ay1X6bN2PnVE/X6KTUOc7TpyyX2pV//Y1uvsVk4kqOEMnMMtTt/k2cwpOGUcdu5hMZhHNm5wNYR1zdlbS3D92QgxSaOQR+pGUCAVi3chNW8p6phrYH/9PjTfzox11R2lB6zSdiKljfFPTAbtSTpvL144ho7OAZRi5T+IuxC0tc+L1EriaOuX5qmQ== x-ms-exchange-antispam-messagedata: +C5Rmzhhjkp8awZWxt5p4ZBZRF3aOG5dwH5Cwdrf555upEdlOL7VRYG7Mhm6+IbOqschYdYvTmURws1LyxBTD0pMt4ovM+zY04oBH0wAj6fNIelRAjvYVBS2oG2uCP4HIe464iYq1tAofCWstyhyVQ== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB5225 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Tamar.Christina@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFTY:; SFS:(10009020)(4636009)(39860400002)(376002)(346002)(136003)(396003)(46966005)(107886003)(81156014)(70586007)(336012)(47076004)(316002)(52536014)(82310400002)(55016002)(82740400003)(70206006)(478600001)(186003)(6862004)(26005)(54906003)(7696005)(6506007)(5660300002)(81166007)(356005)(4326008)(33656002)(9686003)(86362001)(8936002)(966005)(8676002)(2906002); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 6f390931-390b-4183-5301-08d7e76c6fb1 X-Forefront-PRVS: 03827AF76E X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KRBa9VSWwzxsOqqssx8WPnzBXGpTChRXbXsD1u4Rn+PJrkgdE8NP8OJJMZGVqXXawzPM2CW0lx4qhDpyt8MCFbHzgwkJE+3AQNQy3Rw9ew7IqmB7OzmOcBgQVt/LbzWxGFnUxZJgKCUihbcHnFDji83jT/T810Wi1apfd7JhRrTZUQ2QIbLmyGyNBXFTJJ4rS6MPARHGgTwGLUBugm+tB4o8bZbFwsXLRdtvSLHHp9jh6/8btpdlwURav3rjyiKI1avy0xI7frcct8A5rMSU7rEjNyf/5bKIjL7K/ul+BhfC5fa//Th1TwiYon/bXxPXLrLvlEnhA4wGaUJd9smNn6lrqJLn6+jYKdGrDs8y3a0ZafqNB7XXb+Hq8M19LIyiZi/vNk6g7vK2TDLWW3xTAZRk3SVTYETt9W4JtdM2F9U+5FsirPmaMVJjOUFWMt+0WZbX6VcdzFind3dttqBY/K287cRR2N4IIN9ZDMESOJe9ql0eU2Dvu4B93+JaIww31CvJJF6MUErHlvded7Np/bjWplY1Nt+T3lQaVgm5kvx2GdSV7Dc3fiULCo9qECszOeGU8Z7N29oryMwbp26ZnqJcrz1pS6f9Oo8ST5/Tawo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2020 09:55:27.7404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ff22c83-1d51-49a4-df8f-08d7e76c7394 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2916 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_2, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=unavailable 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 09:55:33 -0000 > -----Original Message----- > From: Florian Weimer >=20 > * Tamar Christina: >=20 > > 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_me > > rged_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. >=20 > I had not thought about that. >=20 > Does Gitlab support pluggable merge helpers? The gnulib changelog auto- > merger did a great job when we were still writing changelogs for glibc. I'm not sure and couldn't find a clear answer from a look in the docs.. But I believe it's using git for the rebase so might be able to do it with = githooks? It does have some built in conflicts resolution methods but with some surpr= ising limitations: --- The file, with conflict markers added, is not over 200 KB in size --- And also --- Note: GitLab resolves conflicts by creating a merge commit in the source br= anch that is not automatically merged into the target branch. This allows t= he merge commit to be reviewed and tested before the changes are merged, pr= eventing unintended changes entering the target branch without review or br= eaking the build. --- So you probably don't want it to be aware of the conflict.. Cheers, Tamar