From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Newsgroups: gmane.emacs.devel Subject: Re: Merges from release branch Date: Sun, 29 Aug 2021 15:48:22 +0100 Message-ID: <87eeacl32h.fsf@gmail.com> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> <874kb8mv9q.fsf@gmail.com> <83tuj8ldgi.fsf@gnu.org> <87r1ecl9i0.fsf@gmail.com> <83lf4kl78v.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11170"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org, sir@cmpwn.com To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 16:49:04 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKM7L-0002g9-Ru for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 16:49:03 +0200 Original-Received: from localhost ([::1]:36174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKM7J-0003KV-Un for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:49:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKM6n-0002eu-U7 for emacs-devel@gnu.org; Sun, 29 Aug 2021 10:48:29 -0400 Original-Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:37412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKM6m-0007Q5-FA; Sun, 29 Aug 2021 10:48:29 -0400 Original-Received: by mail-wr1-x434.google.com with SMTP id v10so18495810wrd.4; Sun, 29 Aug 2021 07:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=NSgIoCXxpC3leeZAXOanZeCHONWgiKX24W9eQRcj+uk=; b=KYiIFXXZLSrTY6+HiE224fhjYhSZkkeDjrK4Qc8WesLLcSrOj1tHQU4XmwOPKl2/ce l++3+ih3lQF40fM0APJScHgaryfbG4XApt+oc+hSqofhSHZdSiAFAKAk7gOnBcIfD1Iz zMrgMM+6G/OJcKKm4yFfao0MVUHvNJrIs342/SaXDWisPd5O0WhRwCYgRvxU3JN250Vp 5Gu6YRWFnL9gPVUKNahkVaLKPUbNGFwwlvCGodHV1lqFIfdBZjC8xyXF5b4kDuAyuae1 280rbB6RccbEqysOFoBoswR7WytSoVkiEg+Mzul08g3uOKS208BXmWcgot1cE06uD1A8 0MHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=NSgIoCXxpC3leeZAXOanZeCHONWgiKX24W9eQRcj+uk=; b=X1I00ulRkfvZPSqtoxGbhE33OK1Jhow8SizND7qxcpxkDy/OCWZeOPvPY/yLpYD1LF qcHzyIwhNzG9jvKJyEzMO77etG7TavLomqf0QWuDwyabentpw3cCCEm6eD90xRFQZ02j UP2BnhaF7cdr04snZvomSVU7EAnN/P4+5kJzpwtIptu3/qlw3iJ+D99vIm4n1JDW5//d 4loS054ealjR8GPU4bvnseyXBAKINM0R5a9Y6LyQyTSLzQQ06oVijzVXKAosWaPsbTDD pkExXX+ovPuy9nXFWxqSqJVOOmEfw7kp6Qqck3OGMpNcEQUViYlYZRRZUa99wBm0sOwJ 9/jg== X-Gm-Message-State: AOAM530IWH63tJURSL1oysWG/q2DiHuaLi2MQbFkwr+mRlrD9Jau3kUF ARv4dRlMl//Fl9jBrRr/Nuw= X-Google-Smtp-Source: ABdhPJy/jTVgSQPrLPd63ITEmQhvRlfyRJ9UJ7n94Dzv4wPkW+zmQLQp4Xm8LkXfzgxPp6AOV4kMEA== X-Received: by 2002:adf:f90e:: with SMTP id b14mr22025918wrr.28.1630248506623; Sun, 29 Aug 2021 07:48:26 -0700 (PDT) Original-Received: from krug (a94-133-55-158.cpe.netcabo.pt. [94.133.55.158]) by smtp.gmail.com with ESMTPSA id y15sm12306257wrw.64.2021.08.29.07.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Aug 2021 07:48:26 -0700 (PDT) In-Reply-To: <83lf4kl78v.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Aug 2021 16:18:08 +0300") Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=joaotavora@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273413 Archived-At: Eli Zaretskii writes: > I think you are confusing between the ancestry in the DAG sense of the > word, on the one hand, and the contents of the merged commits, OTOH. What I'm trying to tell you is that -- by default -- in Git, merging _means_ composition of contents of the ancestors, modulo trivial patch-application conflicts. So there's a clear relation between the two things: DAG ancestry and code contents. Git allows you to invent arbitrary meanings for merging, but deviating from the default is confusing to... those who expect the default. > We examined the alternatives when we switched to Git, and decided they > all are either more complicated, or more dangerous, or both. Of course, there are cons to everything: integrating back by cherry-picking involves creating different commits with the same headline&contents, so that if you have many 'emacs-2x' commits to integrate back they all appear again in 'main' (but never twice in 'main'). That could be tiresome to some. Also, with cherry-picks alone, there's no clear way to tell from the DAG when Glenn decided to "integrate back" like there is now. However someone could argue that those cons are outweighed by the fact that no merge commits exists and that ancestry at a given point of the DAG now tells any Git user which code changes are operating at a given point. As to a specific "danger", I'm intrigued. Like Drew, would have to see a particular "dangerous" scenario before I can comment on it. The enormous Git threads of 5-6 years ago I remember are too daunting to re-read. Jo=C3=A3o