From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Protesilaos Stavrou Newsgroups: gmane.emacs.bugs Subject: bug#52126: Problematic characters in info node names Date: Tue, 30 Nov 2021 09:16:02 +0200 Message-ID: <8735neru4t.fsf@protesilaos.com> References: <871r2zueyw.fsf@gnus.org> <83ee6yvog6.fsf@gnu.org> <877dcqn8i2.fsf@protesilaos.com> <83czmivnr9.fsf@gnu.org> <871r2yn4f7.fsf@protesilaos.com> <83a6hmvj7j.fsf@gnu.org> <87y256lo81.fsf@protesilaos.com> <837dcqvh1i.fsf@gnu.org> <87tufullz6.fsf@protesilaos.com> <8335neuxyr.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22512"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Notmuch/0.34.1 (https://notmuchmail.org) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: 52126@debbugs.gnu.org, larsi@gnus.org, kyle@kyleam.com, rgm@gnu.org To: Stefan Kangas , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 30 08:17:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1mrxO9-0005fY-OK for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Nov 2021 08:17:17 +0100 Original-Received: from localhost ([::1]:56140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrxO8-0003sp-85 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Nov 2021 02:17:16 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrxNu-0003qL-L4 for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 02:17:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrxNu-0000eT-C7 for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 02:17:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrxNu-0002BV-8N for bug-gnu-emacs@gnu.org; Tue, 30 Nov 2021 02:17:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Protesilaos Stavrou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Nov 2021 07:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52126 X-GNU-PR-Package: emacs Original-Received: via spool by 52126-submit@debbugs.gnu.org id=B52126.16382565748342 (code B ref 52126); Tue, 30 Nov 2021 07:17:02 +0000 Original-Received: (at 52126) by debbugs.gnu.org; 30 Nov 2021 07:16:14 +0000 Original-Received: from localhost ([127.0.0.1]:40075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrxN8-0002AT-G2 for submit@debbugs.gnu.org; Tue, 30 Nov 2021 02:16:14 -0500 Original-Received: from relay9-d.mail.gandi.net ([217.70.183.199]:36161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrxN5-0002AF-TI for 52126@debbugs.gnu.org; Tue, 30 Nov 2021 02:16:12 -0500 Original-Received: (Authenticated sender: public@protesilaos.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 4E449FF80E; Tue, 30 Nov 2021 07:16:03 +0000 (UTC) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:221101 Archived-At: On 2021-11-29, 22:39 -0800, Stefan Kangas wrote: > Eli Zaretskii writes: > >> The common part should only be committed to one branch. >> Alternatively, the commit to emacs-28 should be marked with the "do >> not merge to master" note. See CONTRIBUTE for more about this. > > Yup. > > Otherwise, I get to resolve merge conflicts over my morning coffee. :-) > > There are unresolved conflicts in .../emacs/doc/misc/modus-themes.org > Conflicts in: > doc/misc/modus-themes.org > > Resolve the conflicts manually > automerge: merge error > > It's not the end of the world, but it saves time if we can avoid it. I understand, re-read CONTRIBUTE, and apologise for the inconvenience. Should I then revert the commit in master and apply to it the 1 difference I mentioned before? Just asking so that we do not commit multiple times. I noticed in 0854453ec2343cbfac3ac8e233cdc7bd2c8554a9 a pattern for how reverted commits should be written. I can follow that. -- Protesilaos Stavrou https://protesilaos.com