From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Fri, 29 Oct 2021 18:42:47 +0200 Message-ID: <87wnlvvl2w.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37458"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 19:21:26 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 1mgVZF-0009Wc-LL for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 19:21:25 +0200 Original-Received: from localhost ([::1]:58066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgVZE-00007U-J0 for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 13:21:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUxy-0003Uz-7p for emacs-devel@gnu.org; Fri, 29 Oct 2021 12:42:54 -0400 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:38252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUxw-0002Vr-M9; Fri, 29 Oct 2021 12:42:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aqH3OSqrvAXZnbXPH0woY6abT5+0K6ArpeBZto4tpfI=; b=uCNihR4ZuHCWu9EBfG65DnzKpn X+iwECJTrSplkDqqP7VI7g4pAn8r4790y9xgooLL1MGRoNAQu4M0nQXJc8KzGYR7KziFCJNPO6wI6 fQ7rsas+QI1oIJ1kCU8RjwVRXdXvcI+jzosU5HZErBcr39e71rLU3VMo1pALknhk8h6U=; Original-Received: from [84.212.220.105] (helo=elva) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mgUxs-0001WM-07; Fri, 29 Oct 2021 18:42:50 +0200 X-Now-Playing: Xeno & Oaklander's _Vi-deo_: "Movie Star" In-Reply-To: (Glenn Morris's message of "Fri, 29 Oct 2021 12:35:22 -0400") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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.23 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:278213 Archived-At: Glenn Morris writes: > The final straw was a triple failure in the automatic merge today due to: > an easily avoidable build breakage in the release branch Sorry about that -- I should have noticed that earlier... > 3 separate merge conflicts due to the same code being modified on both branches ... and one of those were due to me trying to fix up that breakage in a hurry and doing it on the wrong branch. Sorry again. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no