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: Re: Merging emacs-25 into master Date: Wed, 30 Dec 2015 23:54:30 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1451537702 16114 80.91.229.3 (31 Dec 2015 04:55:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2015 04:55:02 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 05:54:53 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 1aEVGG-0007O6-Fp for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2015 05:54:52 +0100 Original-Received: from localhost ([::1]:54650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEVGF-0003ep-O7 for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2015 23:54:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEVG3-0003ei-4Y for emacs-devel@gnu.org; Wed, 30 Dec 2015 23:54:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEVFz-0000bm-VO for emacs-devel@gnu.org; Wed, 30 Dec 2015 23:54:39 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:39100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEVFz-0000bY-Q9 for emacs-devel@gnu.org; Wed, 30 Dec 2015 23:54:35 -0500 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id tBV4sUq8016481; Wed, 30 Dec 2015 23:54:31 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 2ECCBAE312; Wed, 30 Dec 2015 23:54:30 -0500 (EST) In-Reply-To: (John Wiegley's message of "Mon, 28 Dec 2015 12:10:11 -0800") 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 RV5535=0 X-NAI-Spam-Version: 2.3.0.9418 : core <5535> : inlines <4169> : streams <1562957> : uri <2111596> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:197226 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. > Thanks for the attempt, Stefan. Any notes you can send me for when I pick up > the baton? Sorry, nothing very specific. I remember a minor issue in the undo code, but there were more worrying problems elsewhere that I can't remember. > These merges should happen no less often than weekly, so I'm going to do my > first one tomorrow, and then establish a regular schedule after that. Weekly sounds good. It can even be slightly longer, but after a while it gets more difficult to let the author of the problematic code deal with the conflicts (which is usually the simplest option). Stefan