From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: master e714b31 3/6: Merge from origin/emacs-28 Date: Wed, 10 Nov 2021 21:06:20 +0200 Organization: LINKOV.NET Message-ID: <86sfw3bzkj.fsf@mail.linkov.net> References: <20211106092430.31690.17236@vcs0.savannah.gnu.org> <20211106092433.20A2420A22@vcs0.savannah.gnu.org> <87zgqcgg3n.fsf@gmail.com> <83k0hg2avf.fsf@gnu.org> <87sfw4gca1.fsf@gmail.com> <86ee7ndg2m.fsf@mail.linkov.net> <86a6ibdfhm.fsf@mail.linkov.net> <83czn73kqw.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="2607"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: rpluim@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 10 20:09:52 2021 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 1mksym-0000X3-3Q for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 20:09:52 +0100 Original-Received: from localhost ([::1]:48590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mksyk-0001fv-BY for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 14:09:50 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:40026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mksxj-0000ay-Dn for emacs-devel@gnu.org; Wed, 10 Nov 2021 14:08:47 -0500 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:46375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mksxg-0002ji-RG; Wed, 10 Nov 2021 14:08:47 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id B4A331C0004; Wed, 10 Nov 2021 19:08:39 +0000 (UTC) In-Reply-To: <83czn73kqw.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 10 Nov 2021 20:53:43 +0200") Received-SPF: pass client-ip=217.70.183.197; envelope-from=juri@linkov.net; helo=relay5-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, 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" Xref: news.gmane.io gmane.emacs.devel:279193 Archived-At: >> >> >> I vote +1 on the suggestion to just start using etc/NEWS.29 >> >> >> >> Eli> I think I found the reason why merging NEWS didn't work for me, so it >> >> Eli> won't happen again. There was sufficient resistance to using a >> >> Eli> versioned name, so we should stick to what we have as long as it works >> >> Eli> well enough. >> >> >> >> OK. >> > >> > Unfortunately, this is not quite OK. I had to scrape the remains of NEWS.28 >> > out of the NEWS in master. Thanks for the reference to the commit e714b31, >> > this helped a lot. >> >> Actually, this is not the full story. I had also to re-add changes >> omitted in the merge from NEWS in emacs-28 to NEWS-28. > > I'm sorry for the trouble, but we all sometimes need to clean up after > someone else in the repository. I do that almost every day. So I > hope I can be forgiven for this single incident, just this once. No problem for me. But such incidents show why this complicated merging looks scary, so I still hesitate to merge from emacs-28 myself :-)