From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Bj=C3=B6rn?= Bidar Newsgroups: gmane.emacs.devel Subject: Re: On committing significant and/or controversial changes Date: Sun, 24 Nov 2024 04:35:49 +0200 Message-ID: <3972.40662002645$1732415815@news.gmane.org> References: <87ldxb9o3q.fsf@localhost> <86y11bm6oq.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11754"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Ship Mints , yantar92@posteo.net, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 24 03:36:46 2024 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 1tF2UQ-0002sc-CL for ged-emacs-devel@m.gmane-mx.org; Sun, 24 Nov 2024 03:36:46 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF2Tf-0001h9-78; Sat, 23 Nov 2024 21:35:59 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tF2Td-0001gx-3J for emacs-devel@gnu.org; Sat, 23 Nov 2024 21:35:57 -0500 Original-Received: from thaodan.de ([2a03:4000:4f:f15::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tF2Ta-0001zD-7R; Sat, 23 Nov 2024 21:35:56 -0500 Original-Received: from odin (dsl-trebng12-50dc7b-49.dhcp.inet.fi [80.220.123.49]) by thaodan.de (Postfix) with ESMTPSA id 331D3D00072; Sun, 24 Nov 2024 04:35:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=thaodan.de; s=mail; t=1732415750; bh=z32df/0svY4kii+FVVm+NSwsH2Rqleo0TV0Kgk6N5e4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Bfm0kyDcaC9AMO7kB08aPCZS0l686JHwZM5oqM/KacyUE39bZAnjefaYZZMlg3crp 2pS4tAprDNjIoH1mL9jJGFPqVlL6NPgP/JY6Avwuw8MEljaadupddE8tt1iWA8Lrdc vkv6UUu06YlWvTt6EDux+c7g1RyNkqAHpIl6HottPqEW8So9B7rWX3x5QM4A94Miud 7xo8jyvgl/SCDkp8GxSlKnQEs4pZd5K5/1DqIFSpL7WRldt5/12t92xkxlgc1qoGZB xmqM4zxQG+DmTUUIrTclTEfrBis7J1vo6EyK8qQ7bBsm7RSQbbC5zo0MPfsICJKP7N qjp0590cKYIvd45C/2Xnxb3po2Zq+D0dSoM2SJ9S3ffBPskwsHxX0doByd9V4S4lAG Aqi1Z0AEHXKLB7pV1a2OMIvAnHMNrqoQ9F8pMb9tOOFBloHppT68Me/nc/FW/5FBKH pLwInF9AJ53J/AlNcLw1t28MOeesSrtBOiixl6MbV3tGfXfBH5lNN+GQWixS74aM9t 4UCTIUtj/nCe3VQjPRtrhOqZG+E8b7rslJHBMO5USNYGg7ATK96SkkuTG19hZi5Pbl Lq9o4mgB62sI0+i7MfJORBQIlzglQUyedy97utXqvaDsXvPTLXcMNkjY1DJTnK2wTA YV87Ia+sxBkb7qWhZ9wRBsFo= In-Reply-To: <86y11bm6oq.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 22 Nov 2024 21:04:05 +0200") Autocrypt: addr=bjorn.bidar@thaodan.de; prefer-encrypt=nopreference; keydata= mDMEZNfpPhYJKwYBBAHaRw8BAQdACBEmr+0xwIIHZfIDlZmm7sa+lHHSb0g9FZrN6qE6ru60JUJq w7ZybiBCaWRhciA8Ympvcm4uYmlkYXJAdGhhb2Rhbi5kZT6IlgQTFgoAPgIbAwULCQgHAgIiAgYV CgkICwIEFgIDAQIeBwIXgBYhBFHxdut1RzAepymoq1wbdKFlHF9oBQJk1/YmAhkBAAoJEFwbdKFl HF9oB9cBAJoIIGQKXm4cpap+Flxc/EGnYl0123lcEyzuduqvlDT0AQC3OlFKm/OiqJ8IMTrzJRZ8 phFssTkSrrFXnM2jm5PYDoiTBBMWCgA7FiEEUfF263VHMB6nKairXBt0oWUcX2gFAmTX6T4CGwMF CwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQXBt0oWUcX2hbCQEAtru7kvM8hi8zo6z9ux2h K+B5xViKuo7Z8K3IXuK5ugwA+wUfKzomzdBPhfxDsqLcEziGRxoyx0Q3ld9aermBUccHtBxCasO2 cm4gQmlkYXIgPG1lQHRoYW9kYW4uZGU+iJMEExYKADsCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwEC HgcCF4AWIQRR8XbrdUcwHqcpqKtcG3ShZRxfaAUCZNf2FQAKCRBcG3ShZRxfaCzSAP4hZ7cSp0YN XYpcjHdsySh2MuBhhoPeLGXs+2kSiqBiOwD/TP8AgPEg/R+SI9GI9on7fBJJ0mp2IT8kZ2rhDOjg gA6IkwQTFgoAOxYhBFHxdut1RzAepymoq1wbdKFlH Received-SPF: pass client-ip=2a03:4000:4f:f15::1; envelope-from=bjorn.bidar@thaodan.de; helo=thaodan.de X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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, INVALID_MSGID=0.568, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:325642 Archived-At: Eli Zaretskii writes: >> From: Ship Mints >> Date: Fri, 22 Nov 2024 12:47:22 -0500 >> Cc: Alan Mackenzie , emacs-devel@gnu.org >> >> Considering how cheap git branches are, I would add that contributors could create a branch with their >> potentially controversial changes committed in the branch for people to better appreciate vs. users >> speculatively applying patches in their own private branches. > > Branches are "cheap" to create, but are "expensive" because too many > active branches tend to increase the probability of mistakes when > people push changes to the wrong branch or merge from/to the wrong > branch. Rules on such branches should help for example for Glibc there are rules for namespace specifically to avoid this kind of issue.[1] These test branches exist to experiment, create commits such as fixup commits that won't reflect the actual commits that would be merged after the changes in said branch would be in a working state. > Branches also make it a bit harder to track changes people install. It depends on how they are organized. E.g. if topic branches are merged into master which only contain extra commits related to that topic they are easy to track. However if a topic branch contains merge commits where they should have been rebased first before merging instead of merging mater back then these can cause unnecessary noise in the commit history. > So I don't think I like this proposal for changing our procedures. Change is hard but without change issues will potentially keep existing. Making use of features that different systems offer can help to relieve some of the friction and make communication of changes easier. It would be best to take the things learned by people outside of the personal bubble into account. Often they can show use things that we have become blind to or would have never thought of in the first place. [1] https://sourceware.org/glibc/wiki/GlibcGit#Branch_Name_Space_Conventions