From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Merging release branch Date: Fri, 29 Oct 2021 12:35:22 -0400 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12891"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 29 18:36:41 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 1mgUrx-00039c-BG for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 18:36:41 +0200 Original-Received: from localhost ([::1]:36620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgUrw-00039K-Aa for ged-emacs-devel@m.gmane-mx.org; Fri, 29 Oct 2021 12:36:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUqh-00017q-U5 for emacs-devel@gnu.org; Fri, 29 Oct 2021 12:35:24 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:43022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUqh-0000vt-MD for emacs-devel@gnu.org; Fri, 29 Oct 2021 12:35:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=IFaqMiYK01nRyBulCZtQM3dqfIWGneHPHw/Nj9U4IIA=; b=QEXca51sLgE70b fPlIQCE0PCTeEBXO76WUy1EJRW47fET9RUG5jh6mEbx1D5Jr4aiHeZZzLvNtcI0bdJdKMlU0L/hWp E5H3dw6k50mfd2EtuL6LZ7VnsKVzjsLupa+zWYTZsnNLqE4KF6HqylmD0jv78uAigwmPT+m5I7O/c 7MoVyerZFxbMprFr4qKn44h2h9SXawfv+gWPYjTJNrDEdIrDJapv7xIUhAv69NCCPL84iy4IuDU7o asWzwdEQCXR360wnQOgugmNUuUr9CM2Ob9oYJ8BmxQDHbZbeEZjDLtndcyOt5x8BFbT7U96xb9l7d Kjr3mtes0IOWGxneVqDQ==; Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1mgUqh-0004Di-1A; Fri, 29 Oct 2021 12:35:23 -0400 X-Spook: Platform kibo mania Pork Conficker National preparedness X-Ran: SOy0:32}ca>mg;EXiT"g^pmHmY$7n/%eN'1`^Z(i5r4F`2^btKC+5@4^:Jyuo`Y.9q3Fh* X-Hue: magenta X-Attribution: GM 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:278211 Archived-At: I've had enough of merging the release branch to master, so someone else will have to do it from now on. I use admin/automerge from cron with a wrapper that: 1) first checks the release branch passed make check 2) passes "-n 1" if the last merge was more than 1 week ago The final straw was a triple failure in the automatic merge today due to: an easily avoidable build breakage in the release branch a non-repeatable check failure due to network-stream-tests timing out (such classes of test failure are common) 3 separate merge conflicts due to the same code being modified on both branches