From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29 Date: Sat, 13 Jan 2024 19:32:32 +0200 Message-ID: <83zfx9f8b3.fsf@gnu.org> References: <170514226115.19096.4951628921236684038@vcs2.savannah.gnu.org> <20240113103754.667A6C00227@vcs2.savannah.gnu.org> <87v87xchms.fsf@gmx.net> <831qalgoe3.fsf@gnu.org> <87r0ilcg3n.fsf@gmx.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4233"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jan 13 18:33:55 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 1rOhtK-0000nv-EO for ged-emacs-devel@m.gmane-mx.org; Sat, 13 Jan 2024 18:33:54 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOhsN-00083k-Jm; Sat, 13 Jan 2024 12:32:55 -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 1rOhsL-00083c-Hz for emacs-devel@gnu.org; Sat, 13 Jan 2024 12:32:53 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOhsK-0000pl-SS; Sat, 13 Jan 2024 12:32:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=wbYutRFWzKtUG7QyLUckdxuSrCmoK9+YB5mnOMPs2f0=; b=kUeJ9STOLUGF RBjhvL6Ga3ggRfZKmVcL2n1hWxJdy/2uyGU7LZ1Z/sXPILYkiCyuq5TRNtRF4Yvo/wYJgtAjuanPA oFM4oqi8pXIygBGvLX7aC710WduJQmeNt4nqUqSvWBSypx2ikKVgSv67L//whBmIuLiY+XEzfXOti 68iNcELJhhLhFv9+FzYNMWuf6+UVBSWb8475v7Nr5qh6nHDnbVigZ/fmzIJc/7v85KfiHooZ63G07 8gq5klgXayakjljRGkHvJZjzz1Z33pwGD72kfCFuCBZHKjOaIIycPXRoSS9rQQi00E317tPzRTR9q ur+/a5aDZYXp/Tf2oBKYDA==; In-Reply-To: <87r0ilcg3n.fsf@gmx.net> (message from Stephen Berman on Sat, 13 Jan 2024 18:12:28 +0100) 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:314932 Archived-At: > From: Stephen Berman > Cc: emacs-devel@gnu.org > Date: Sat, 13 Jan 2024 18:12:28 +0100 > > On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii wrote: > > >> > The following commit was skipped: > >> > > >> > 26eb9d3a8a6 Fix typo in lispref "Creating Strings" section > >> > >> Because of this, the typo stills exists on master. Is this due to my > >> having mistakenly committed the change to master and then reverting it > >> and committing it to emacs-29? > > > > I guess so, yes. > > I wonder how this happened; I didn't mark the commit for skipping as per > gitmerge.el. I guess some subtle bug in gitmerge.el's algorithms. > >> Does it now have to be manually installed to master as well? > > > > Yes, please. > > Done. Thanks.