From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Merging emacs-25 into master Date: Fri, 25 Dec 2015 23:35:14 -0500 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451104548 2177 80.91.229.3 (26 Dec 2015 04:35:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 26 Dec 2015 04:35:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 26 05:35:39 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aCgZt-0007zc-Da for ged-emacs-devel@m.gmane.org; Sat, 26 Dec 2015 05:35:37 +0100 Original-Received: from localhost ([::1]:37331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCgZs-0008KK-Ft for ged-emacs-devel@m.gmane.org; Fri, 25 Dec 2015 23:35:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCgZg-0008K9-GA for emacs-devel@gnu.org; Fri, 25 Dec 2015 23:35:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aCgZb-0001r1-Df for emacs-devel@gnu.org; Fri, 25 Dec 2015 23:35:24 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:39780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aCgZb-0001nT-6p for emacs-devel@gnu.org; Fri, 25 Dec 2015 23:35:19 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id tBQ4ZEHY019801; Fri, 25 Dec 2015 23:35:15 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 2FC25AE204; Fri, 25 Dec 2015 23:35:14 -0500 (EST) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5530=0 X-NAI-Spam-Version: 2.3.0.9418 : core <5530> : inlines <4155> : streams <1560268> : uri <2108630> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:196876 Archived-At: I just tried to merge from emacs-25 to master, via gitmerge.el. Just to let you know that this sucked, and after fixing a few obvious problems by hand and finally bumping into assertion errors, I simply gave up in disgust. It's not healthy to wait that long before performing such merges. Good luck, tho, Stefan