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 e714b31 3/6: Merge from origin/emacs-28 Date: Wed, 10 Nov 2021 21:13:09 +0200 Message-ID: <83bl2r3jui.fsf@gnu.org> 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> <86sfw3bzkj.fsf@mail.linkov.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26489"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, emacs-devel@gnu.org To: Juri Linkov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 10 20:14:46 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 1mkt3T-0006e1-Q0 for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 20:14:43 +0100 Original-Received: from localhost ([::1]:52206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkt3S-0004OH-QZ for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 14:14:42 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:41108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkt24-0003hU-1q for emacs-devel@gnu.org; Wed, 10 Nov 2021 14:13:16 -0500 Original-Received: from [2001:470:142:3::e] (port=47498 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkt22-0003KQ-5D; Wed, 10 Nov 2021 14:13:14 -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=4HRBp/5981OmPCMXp9cv+FU3safs/j07bMvMLnRUaLw=; b=VuXs1xO3jWXq NX1yQZDB+Xbllx7mi/OI8cFF7+7zQYlQsBbU1wMIaugCk4rlYM5/oseB39HwZpegulXoJIur+ADez bDv5L7+yeyuhdX8afySro+IYhKxoJXETdyZyPwMBNZGt+gr0dBaENxo+KP6gvgqp4Kter93+w0uH5 NG2eJvTEzf7E1yUsCa1+xNXBNAmJNAbXes+5vppkbJOR8xaGb1Rt3L/LHHZhITf75TBHL8vjnfOUU hV9c/HuCRQNP1htCWQkbMZzDKgCc+zg/WO+bkMqZzuAawueLWpSmubmVAK2n/gpA3rPAbkRDLr5rR MG1wvk1kZmw4TiCSyeaurw==; Original-Received: from [87.69.77.57] (port=4451 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkt21-0003LP-ME; Wed, 10 Nov 2021 14:13:14 -0500 In-Reply-To: <86sfw3bzkj.fsf@mail.linkov.net> (message from Juri Linkov on Wed, 10 Nov 2021 21:06:20 +0200) 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:279194 Archived-At: > From: Juri Linkov > Date: Wed, 10 Nov 2021 21:06:20 +0200 > Cc: rpluim@gmail.com, emacs-devel@gnu.org > > >> 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 :-) That's okay. You don't have to feel bad, there's more than enough people who merge regularly.