Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:113868 Return-Path: Delivered-To: mailing list internals@lists.php.net Received: (qmail 88809 invoked from network); 30 Mar 2021 14:49:48 -0000 Received: from unknown (HELO php-smtp4.php.net) (45.112.84.5) by pb1.pair.com with SMTP; 30 Mar 2021 14:49:48 -0000 Received: from php-smtp4.php.net (localhost [127.0.0.1]) by php-smtp4.php.net (Postfix) with ESMTP id C99771804D3 for ; Tue, 30 Mar 2021 07:47:00 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on php-smtp4.php.net X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_SOFTFAIL autolearn=no autolearn_force=no version=3.4.2 X-Spam-Virus: No X-Envelope-From: Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by php-smtp4.php.net (Postfix) with ESMTPS for ; Tue, 30 Mar 2021 07:46:59 -0700 (PDT) Received: by mail-lj1-f177.google.com with SMTP id o16so6147348ljp.3 for ; Tue, 30 Mar 2021 07:46:59 -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=44vRlDp9NRyXKpE5wwrdyC8iWR+HGvhmPVCW3Xk7fPU=; b=jSSwgsCqU7eU1M/tGbVazwycf+Lc+RlcUxEGYkBrRhKZsUlJvLY9SkXTfiRhcncVI0 9H8TjdB8ttnO4jKBRoyTfgxXowjTDQqltJWbH+XWMZf+vcvBY6733cky6Oh/Yq+eC1mo VxY7Mi/os2TMnU7nnPzCPmqK4ESkS2SEoGBBJbFRcuDX0S0RK02iL3e22CEOePfxaw0N F+OyPD8cTzzXOHjA19NMLKLq3WAwrLs50Nwle1fudvyo9lr1vGrRVq/6/OiU+ZU35BSO 7iW06vlgQCuSr1Q/nN1Hcqoh1Rewxv/0rEA2iYz/ls3eiizatFaxi1n6PPYSXm6+Uxf6 /U6w== X-Gm-Message-State: AOAM532Ttdp1DopnopTd/X0hQ/BE+3cfI/l9jbnYm3hurpQt6q5o3gNC fXwyOgsJgZuLITV64Wjg5Z5n06YPNyFhSQCi3eEb4GaM/b2DqpYA X-Google-Smtp-Source: ABdhPJzhqy3hDWrviGo52l1x90YyZHui8JivQzXzlfVo3n1EQT049Fd1P+BiFd68wVShwls4smqOOITrVWQlGKCB98U= X-Received: by 2002:a2e:2c0d:: with SMTP id s13mr20802723ljs.105.1617115618324; Tue, 30 Mar 2021 07:46:58 -0700 (PDT) MIME-Version: 1.0 References: <6c3d7c13-d7cd-c1cc-5876-2b8c200a017c@gmail.com> <91F57903-6280-4F0C-903E-A9B1401F0A25@newclarity.net> In-Reply-To: <91F57903-6280-4F0C-903E-A9B1401F0A25@newclarity.net> Date: Tue, 30 Mar 2021 09:46:47 -0500 Message-ID: To: Mike Schinkel Cc: PHP Internals Content-Type: multipart/alternative; boundary="000000000000fdc24805bec211b6" Subject: Re: [PHP-DEV] Changes to Git commit workflow From: pollita@php.net (Sara Golemon) --000000000000fdc24805bec211b6 Content-Type: text/plain; charset="UTF-8" On Tue, Mar 30, 2021 at 9:08 AM Mike Schinkel wrote: > On Mar 30, 2021, at 9:50 AM, Sara Golemon wrote: > > On Tue, Mar 30, 2021 at 8:34 AM Mike Schinkel wrote: > > When you speak of NEWS, do you mean this? > > https://github.com/php/web-news > > > Negative. NEWS in all caps invariably refers to > https://github.com/php/php-src/blob/master/NEWS which is a guaranteed > merge conflict between branches. > > There are a few other places that mostly impact RMs like > main/php_version.h and configure.ac > > > Is there any chance the team would consider modifying the workflow a bit? > > I thought about this (admittedly briefly) while replying and while I think fixing NEWS would be... not impossible, I think the configure.ac and php_version.h conflicts are a little more dicey. Granted those are only a problem for RMs and we can build an escape hatch for that. But then conflicts in the rest of code aren't exactly uncommon, especially in areas under heavy development like ext/opcache. Basically, this is a hard problem and it's going to be a hard problem. One alternative might be to switch to a pick model rather than a merge model, but that just kicks the problem out a layer, it doesn't solve it. What it does do is add a new opportunity for fixes to get missed. -1 from me on that. -Sara --000000000000fdc24805bec211b6--