From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: emacs-29 e2ac0d416b9 1/5: ; Merge from origin/emacs-28 Date: Mon, 20 Feb 2023 08:50:10 -0800 Message-ID: References: <83h6vhwpop.fsf@gnu.org> <83fsb1wmeh.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36040"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Feb 20 17:51:13 2023 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 1pU9Nh-0009BP-AZ for ged-emacs-devel@m.gmane-mx.org; Mon, 20 Feb 2023 17:51:13 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pU9Mp-0003wp-3Y; Mon, 20 Feb 2023 11:50:19 -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 1pU9Mm-0003wa-0u for emacs-devel@gnu.org; Mon, 20 Feb 2023 11:50:16 -0500 Original-Received: from mail-oi1-x231.google.com ([2607:f8b0:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pU9Mk-0007np-Ep; Mon, 20 Feb 2023 11:50:15 -0500 Original-Received: by mail-oi1-x231.google.com with SMTP id bh20so1326525oib.9; Mon, 20 Feb 2023 08:50:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=Gn/Jm9NKrML7KTA6xo3t1de+oFHbfujG7O4GP25fspk=; b=mq7UsWblFN0Dp0DdamrWjhfKAT/uxzObXTsZ4Y3yvzbtKlln3oq5K6NDAG7XjAQBwo 6t5Frlp0+8WkOEIBVe3zTlf/qDW1hUu75QsWPzrmDKdfMxvavMgTUmEpSmjA8Llb++9V 3AJK+9qlemJJWZ52wPNQ9GG8K56f09NXEPRP5Y+Y6ce7PWj3OCcuWisQqA22fFfyTp9m Tjky02rrMlvpCs2oT+0tDCNyJLe0oSI0s0o/UVJ9nPWaFO1Uzc+pW0QJFdjTM28qhDjs 3VFWzV3lVMt6XfByztqMIv6w27wTgyYNqHm7GlXUPCT1/Z0IOvYENFqQvsh+6LiSqY8f 0w6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Gn/Jm9NKrML7KTA6xo3t1de+oFHbfujG7O4GP25fspk=; b=leDNY/SuwkFvhPgKQER1nwQJYlV5CHSCXw2r+PPMd9ifAGy9Lxw50iN90+Q8qaqTki F9WKrpfq+WUvcfjycRl02Kjx9tzUtQOS/QJFeTja9Gh2kPH/p/IbILnEoXvCgK9CVqZX d6Wbio4LMDumgldQ3b3f5bBzZGEogTE0vCtrqAFPz/oWIqI6qp/1XCL6Ws0cGLL8ORun IkdLZdQURJgH09A+wzcUFjMoyTkgzXI+b86JhECFKt/AV+YcL3cPLOcGxojwX0joTqvf iwd32/vJM4JUaSGznoKZOXHFlBQCTPWcLXvD3NQWhFZAv1tO1f8EMiiawk2Z+DNRO0vU 4JSA== X-Gm-Message-State: AO0yUKV+WW+QRFSNBpz5v5Sz34OtOt97RBboLNToBfZKWfs5Qg/IHniP FFV1ZSE65/mkETB0qq30Ml14twrsZsO1xBX322gSkwey X-Google-Smtp-Source: AK7set//O0kdBziuKV6hYMEFuov3N/K64/HzE9lE9Xi5FXAdOM0DOxkBh2EbwL7DwBfD5t56jMajO63tpg8Q/W3mOKQ= X-Received: by 2002:a05:6808:11c5:b0:378:3f53:9e8 with SMTP id p5-20020a05680811c500b003783f5309e8mr1388698oiv.291.1676911811177; Mon, 20 Feb 2023 08:50:11 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 20 Feb 2023 08:50:10 -0800 In-Reply-To: <83fsb1wmeh.fsf@gnu.org> X-Hashcash: 1:20:230220:emacs-devel@gnu.org::jbKyC5KxztXnKOQf:0jpf Received-SPF: pass client-ip=2607:f8b0:4864:20::231; envelope-from=stefankangas@gmail.com; helo=mail-oi1-x231.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.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:303614 Archived-At: Eli Zaretskii writes: >> git diff 068b53500e24b7b..ad6c6a3a11569c4 > > Why would we need to eyeball all those changes now? It's a wasted > effort. We never merge to the release branch, never. I already eyeballed all of those changes, so there's no need for you to do it too. Here's a summary of the changes: $ git diff -b --stat 068b53500e24b7b..ad6c6a3a11569c4 ChangeLog.3 | 430 +++++++++++++++++++++++++++++++++++++- etc/AUTHORS | 24 +-- etc/HISTORY | 2 + 3 files changed, 443 insertions(+), 13 deletions(-) > You will recreate those as part of tarring Emacs 29 anyway, so why > merge them? You left out the part of my message where I explained this, but a merge preserves history and tags. That's generally why you merge instead of simply copying files. It also happens to be more convenient. > It is simply unnecessary risk, and something we never do, for very > good reasons. I'd sleep better if you'd reverted those changes on > emacs-29, and made the single change in HISTORY by hand. The risk is minimal, since we're only changing documentation files and not code. There is also a big gain in simplicity. These are standard git operations, after all.