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: master updated (18e7bc87521 -> c71a520d1da) Date: Mon, 7 Aug 2023 04:58:28 +0200 Message-ID: References: <169136956945.2149.648813436805504636@vcs2.savannah.gnu.org> <87wmy737ld.fsf@yahoo.com> <87leen37gk.fsf@yahoo.com> 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="36385"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 07 04:59:40 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 1qSqT6-0009Jf-D0 for ged-emacs-devel@m.gmane-mx.org; Mon, 07 Aug 2023 04:59:40 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSqSG-0005KS-Ht; Sun, 06 Aug 2023 22:58:48 -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 1qSqSF-0005K6-4e for emacs-devel@gnu.org; Sun, 06 Aug 2023 22:58:47 -0400 Original-Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSqSD-0007SS-I2 for emacs-devel@gnu.org; Sun, 06 Aug 2023 22:58:46 -0400 Original-Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4fe457ec6e7so6611704e87.3 for ; Sun, 06 Aug 2023 19:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691377123; x=1691981923; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ZUCb4DZY/p/6IfZoMzl3tUXyX4t3O+CCLf2NXcFo6Is=; b=n08RW91V9kfFkvs/0MInrbG8kmJvwD+IKC5VlNGwC3nz8lYW6kizsgnz3zFTOd9BVU hLWWidfDkgKbRzGIwcZjlb8T74NnEvR44wE9T19hEwGJu/qGe3ET0PFzms22+mgG6KPv blB3Q6FBcsj1VB8egyhRU63FKb8HqvSHRKXV3LVFYzN5ZxLMxlh/rOVQEKp3+qVhlAee rbLxu4TQfzoZt23lUtgfG0mpfFCS4mJing4Zk+48NfMaB5V8lApJtxZjcVNRRt6i+IwT 6iQ1IT7uc40En8e98K7S62FEKV8oQVSzaOdC673t9xwxf9OZ62JNP62Cz6EbkHu2GzEU w7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691377123; x=1691981923; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZUCb4DZY/p/6IfZoMzl3tUXyX4t3O+CCLf2NXcFo6Is=; b=YQAaTx1/G7KMwVh5SsPN6ReoyC9oIABLOvN35CyRlQ41fx2JDTjhDmUtSVd8F+rRx8 rNSMFtaMULxr27RKjRD7lpXeikVwKxNkZgQOGan6zRoDaPk+8YkxouH6bhy1tVt4VL1t f8pzCZusFDj3f/hgqRvPWvgoqAU6rB3bYNSJl1QqIKXBPdsSshcHSv8wWjjwYNmoOtbf HTzPG0oWosW4PqYoii7mRyCGyORYFV749FreuLXbwXkF6eKX6Wpgi6RR+Qr6hSMAVY6z wUISg5A1OQvr0pwDpKOKHIF/mF51yavq4FvtaIE6Tr5vPblKt7SHjiWLrlcULuAkwKnh OWIA== X-Gm-Message-State: AOJu0YzY/1QZizNthPnBApwdoN0wY6daN7vKmHFEznIb/EytFOQhbFCz KFdZa20it3b88On4bKZbGN7TL/JaeMJPUh62KEw= X-Google-Smtp-Source: AGHT+IEMPNoJlN6QhgNKekJ984YzBzX5E51CUV4dMV1ZTdfdFAVz6bnX4cTU42sJRNtSSPDhcE6W3Jbu5xq8DPVwo1k= X-Received: by 2002:a19:645c:0:b0:4fa:f79f:85a with SMTP id b28-20020a19645c000000b004faf79f085amr4709036lfj.69.1691377123089; Sun, 06 Aug 2023 19:58:43 -0700 (PDT) In-Reply-To: <87leen37gk.fsf@yahoo.com> Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=stefankangas@gmail.com; helo=mail-lf1-x133.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:308398 Archived-At: Po Lu writes: > How can this be avoided? I merely ran: > > $ git merge --edit --no-ff feature/android > > within a checkout of master; the --no-ff was necessary for supplying a > ChangeLog entry for the merge itself. That looks like the right way to do it, so this is a false alarm on my end. Sorry for the ruckus. I believe that I got confused for a second there by the large number of merge commits from master into feature/android. I think in the future it would be beneficial if feature branch authors could try to keep the number of merges from master a bit lower. In admin/notes/repo we have this advice: In general, when working on some feature in a separate branch, it is preferable not to merge from master until you are done with the feature. Perhaps we could expand it with some advice that would be more directly applicable to long-living and "large" feature branches (such as android and nativecomp), where postponing the merge until the end might be impractical. > That's totally fine by me, but alas, you have not told me how to perform > this procedure. Yup, false alarm. I apologize again. (I'm pretty jetlagged and just came home after an 11 hour layover due to a delayed flight, so I should probably not be at a keyboard right now...)