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: Tue, 21 Feb 2023 01:53:12 -0800 Message-ID: References: <83h6vhwpop.fsf@gnu.org> <83fsb1wmeh.fsf@gnu.org> <83y1ostfw4.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="12619"; 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 Tue Feb 21 10:53:56 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 1pUPLQ-00037y-Or for ged-emacs-devel@m.gmane-mx.org; Tue, 21 Feb 2023 10:53:56 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUPKo-0002db-CO; Tue, 21 Feb 2023 04:53:18 -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 1pUPKm-0002dD-KS for emacs-devel@gnu.org; Tue, 21 Feb 2023 04:53:16 -0500 Original-Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPKk-0007HG-TN; Tue, 21 Feb 2023 04:53:16 -0500 Original-Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1720f9792bbso4153496fac.4; Tue, 21 Feb 2023 01:53:14 -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=po3hBLJfxITC6Ss6CPuxJ6mKbDALsUA9csxDhecTSvo=; b=eMxLprZJry/LLrQzhYcaZiClfmvaQ/W4z3aBcjJTUmAH7gPyFWlDEtVj8T7+p4NY8u iIH7oxgbh3qnbfnbzeurjrVsnooUQGq1MwvZva3lqahPDw7+6WQco0bN/0CJRmsYd95j bDcTFU+g6VZFvn45suN5hdKM+Ug1MdoNHo75hgx9triHn3Ra8IiIiloKfZ7gIpnqQBsp jeSARDwlTxFLQ3TjUuxVtwlOEu5SdYeyC8lCsT+zfXCi8ZSQuUvHJTEMKTdvMxdQPEty ETYZCWLukB02pPYEclWW5obEbOhA9Zwe5bmA+Y32DhjLDwsPTIU1f5Epb1d3zjVaK2Zi I1KQ== 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=po3hBLJfxITC6Ss6CPuxJ6mKbDALsUA9csxDhecTSvo=; b=43VfLnJAWMRpoQrRauscaxzhvYSHgH5pox0XR8TQ7D4ydP81GRhLQrpkCaw73LK/rA Ny+Dr2lBbumjZFhGqmqHQ+dKQf9g2e2EBwFeh3XPjHleD8q74RDISaxOFx04zgiz5tI7 QNPxczuuS/hLfAntPgeDTDe7x7ZxBZleO7gkorIoYKx/8ZEbzlUezEoLKxzsasisVPBD fNi9qA+dzPV09gH+BBFt83D32dBagZT9VSGN2t01avzW5K3XV9kDj2KvsrxxwT6768Zc q91Jnti3VIgxjtAK2puIdKo4QEz+IohGoY2/P6NTg8WxD6gpY1mBBPClugcFZdNfG9hG sUAw== X-Gm-Message-State: AO0yUKUUwnqK3o8FCuDjGLG9T3koCrTEsM1On9gRKdatktuM4dmFNXeY 5GucxlFDW7fcfIggNLPJdt5AtXiq1hWNFSFYWk5NiQSo X-Google-Smtp-Source: AK7set+FwhPe9kJQvhTGekbkRBF6axL99XSFRg6f8mPApuOH5rZOP+R5Bmz5LvlnfwM2VpfZu83OBsGCTWw9CjSQa5c= X-Received: by 2002:a05:6870:830a:b0:172:332e:3e76 with SMTP id p10-20020a056870830a00b00172332e3e76mr100183oae.291.1676973193111; Tue, 21 Feb 2023 01:53:13 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 21 Feb 2023 01:53:12 -0800 In-Reply-To: <83y1ostfw4.fsf@gnu.org> X-Hashcash: 1:20:230221:emacs-devel@gnu.org::QybA93oA0lcbdQGh:4M7B Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x32.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:303638 Archived-At: Eli Zaretskii writes: > You could miss something or make a mistake, couldn't you? It's > possible. Yes, of course. That's why I prefer using standard git operations (as opposed to merely copying); it is a way to mitigate that risk. > I saw many more changes brought be the merge. Please try again, but use the -b flag. Otherwise, you will include removal of trailing whitespace in three files. (Our git hooks blocked merging in the presence of such files.) >> The risk is minimal > > Famous last words. > > Why should we have _any_ risk at all? There's no gain here, > absolutely none! Risk with no gain makes no sense... The gain is workflow efficiency, which is of course non-zero. Merging, in this case, is also a gain in simplicity and convenience. When I said "minimal risk", that was is in reference to that we are discussing documentation (non-code) files. Sorry for being imprecise. Meanwhile, copying file contents as juvenile commits is generally high risk due to the limited traceability.