From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: master updated (18e7bc87521 -> c71a520d1da) Date: Wed, 09 Aug 2023 16:35:58 +0800 Message-ID: <87zg30wr2p.fsf@yahoo.com> References: <169136956945.2149.648813436805504636@vcs2.savannah.gnu.org> <87wmy737ld.fsf@yahoo.com> <87leen37gk.fsf@yahoo.com> <87pm3w8vye.fsf@gmail.com> 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="1982"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Stefan Kangas , emacs-devel@gnu.org To: Robert Pluim Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Aug 09 10:37:07 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 1qTegj-0000Lk-M7 for ged-emacs-devel@m.gmane-mx.org; Wed, 09 Aug 2023 10:37:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTefw-0002Zs-3c; Wed, 09 Aug 2023 04:36:16 -0400 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 1qTefq-0002Xe-NL for emacs-devel@gnu.org; Wed, 09 Aug 2023 04:36:11 -0400 Original-Received: from sonic304-20.consmr.mail.ne1.yahoo.com ([66.163.191.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTefp-0002GM-7M for emacs-devel@gnu.org; Wed, 09 Aug 2023 04:36:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691570167; bh=ZYIGzWj25bazJ8xgjt5D1ZwVS/RRtp4+ixgSAiiZTd0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=b4txJ+z3zD0ch3PnoxE1+GrNyRPwhgyw794x6jU8FBePdD839TYM/0iYArMnwwZnZ0JXwF+J4maNl1q5BBsBkxPd5NaGgoczLu7PwqUTmNNPv++m0g7m8i+sXQZrGxAcRw6Ac2TspWlPe8fZwBv/uCZK5lKJfsnExEq43vcPjfQyrnZzAhyX9x9moyqS4kevoGHAF0Ob6PPsaNstea6PsVtdxETkRq7DOX4zt9CWWSQMEkkHY6u/29iKyS3KL6moV+R9Hero8iWcE4qDfyXrdMJNYd552JKoRvoVUb2f+MVJF8Caf8eZkNbmgp19jX8gcfSFRthBrWCPIOVTjxX1gw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691570167; bh=e5WYuaDsdBv+D8QCu2V+RzlYm1fn/drjPDYMHnu9b8m=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=gZqkaZgb+t7UUOB/TCWXFYOYwH8PW5hsKGePlS+m3i3wxPp1+iDoGBaZMvFMADYc2UT0F0GWkY+DNhvX1d9odrvnQxWSNuKjtu/pmfHSJDuMCPjQaPddTJQkSLlxu/eev87SWo15Or5hkwheWr4UWeAPULNC7xtihggQfjmWG+JcAEdzN15ToFcVxGCT8U+iR5SZq4Ozmf59PyIfAbKAaeduSGeeagcUiI7FZvC9g4wubPJwnSyemoDx9X5NHf1eU590ae57Q+BPqjW+nFJUMLDgselrtGXpduese84UQPsZdjhxL3m4VRGEf0rYaO39W1GhNRpD2lpTBPxGyRU25w== X-YMail-OSG: jMfHkdgVM1nWssRetoIJ5y5BWVo9wpG86EuDY75XANgcW.EsuacU3zRsbWS_FWO zhlyqW7JhngpYYvsaAMSdFYLT8DGRH3ZDn_Brue.loUAi0GnxcxBbd42YXyTwbtuqGTPTehka7Qn Mca4ZYqs0rbf463rftVxPgaUDrJtoEcc8Mf_i8JFgL3aYGVOE30gs1hQHiR6R60uAdmKJvX1dlbL hjvpvrtiwojRtluvaKYg9UsWpWHEiC.d7OOmNhk4DGHKuLH5CNq1hexwraXcKkA6420X_LU2J5SB maYq_tatw6xThQYi4LNEKzy1C46YmqP_rr7yvSyPm473kqTV__v9RpbwMHaxEubMyClfzefnZzKl tsf3hl_Rlr7qE5YvQCIXJTDOLQW2k10u4Txk5uVydJNZkfiAVPpDp5cVyjjaRFYGUOHPayZZ0gkv _ApNerUnQt17AEb5rI8XMXhKvONqIVGAlx4Zuu6r4.PDZpE8l.zYjiOV.1EBJDNTOeRxmqgg3EZ5 k5faGRRB3kS9rmn1N9gwQWWQbA78VLV49ZeFbzr_3TFi7va5Ob4VszIqRUmMx6Frr5JtWytcaICF LiWeZz2UIqwRCIJ1qOahepH2OmUSDVh4HP4W.sM1TrEQ5O5Hgo8zQRil6nrULhuj5F4yD.Tkn0sT a0Oot05IOswn3N66X2clGUpnVCQIgiazhbhna3N52wlvibDBjSEZ0JUGAzs8.zidBvl.XA33nOhP 1HpxaZmyMhFoQRWCUrWQSMc8E0_c.KWs1HcjfXqYkTXSS2vUrWN4d6Kml1B0Lrs3SbenYz7T4fab ZzlmK4n_wQ_CMZuIf0CYC6zhPwLZCI8Ez5TDH1B3Im X-Sonic-MF: X-Sonic-ID: 0321296c-2342-4e6e-ae5f-f99cf9011a15 Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ne1.yahoo.com with HTTP; Wed, 9 Aug 2023 08:36:07 +0000 Original-Received: by hermes--production-sg3-69654d8bd-tsbjv (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 85150f1731e2cde4e65a6e296b3ab526; Wed, 09 Aug 2023 08:36:02 +0000 (UTC) In-Reply-To: <87pm3w8vye.fsf@gmail.com> (Robert Pluim's message of "Wed, 09 Aug 2023 10:24:25 +0200") X-Mailer: WebService/1.1.21695 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.191.146; envelope-from=luangruo@yahoo.com; helo=sonic304-20.consmr.mail.ne1.yahoo.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, RCVD_IN_MSPIKE_H2=-0.001, 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:308459 Archived-At: Robert Pluim writes: >>>>>> On Mon, 7 Aug 2023 04:58:28 +0200, Stefan Kangas said: > > Stefan> Po Lu writes: > >> How can this be avoided? I merely ran: > >>=20 > >> $ git merge --edit --no-ff feature/android > >>=20 > >> within a checkout of master; the --no-ff was necessary for supplyi= ng a > >> ChangeLog entry for the merge itself. > > Stefan> That looks like the right way to do it, so this is a false al= arm on my > Stefan> end. Sorry for the ruckus. > > Stefan> I believe that I got confused for a second there by the large= number > Stefan> of merge commits from master into feature/android. I think in= the > Stefan> future it would be beneficial if feature branch authors could= try to > Stefan> keep the number of merges from master a bit lower. > > Like zero :-) > > Stefan> In admin/notes/repo we have this advice: > > Stefan> In general, when working on some feature in a separate br= anch, it is > Stefan> preferable not to merge from master until you are done wi= th the > Stefan> feature. > > Which is why you should rebase in that situation, but some people > don=CA=BCt like rebase for reasons that I don=CA=BCt quite understand. "I= t was > slightly broken in a version of git from a decade ago" is not a valid > argument: emacs developers should be expected to update their > tools. Rebase isn't possible on feature branches, AFAIK, as they demand force pushes.