From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: Merging emacs-25 into master Date: Mon, 28 Dec 2015 12:10:11 -0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1451333444 18733 80.91.229.3 (28 Dec 2015 20:10:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Dec 2015 20:10:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 28 21:10:37 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 1aDe7o-0008Pt-Sq for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2015 21:10:37 +0100 Original-Received: from localhost ([::1]:46092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDe7o-0004rV-2y for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2015 15:10:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDe7Y-0004rL-Ub for emacs-devel@gnu.org; Mon, 28 Dec 2015 15:10:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDe7V-0007hA-Pk for emacs-devel@gnu.org; Mon, 28 Dec 2015 15:10:20 -0500 Original-Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:34501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDe7V-0007h5-Jb for emacs-devel@gnu.org; Mon, 28 Dec 2015 15:10:17 -0500 Original-Received: by mail-pa0-x22b.google.com with SMTP id uo6so91846395pac.1 for ; Mon, 28 Dec 2015 12:10:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=0slynz0Z49GiRL/cC4+/HVe112YppLHkAtfxCa5Xr2A=; b=d/+QUuMl25QS+oaaTAPFcb7hPiRRDjsvYzopuvdjF7F2wYSc6Q3icQQnnN67eeUSy+ NUnseckvlFW2kW/DZp9glfKpB6pJXf5b5XoQFLfnYzdHrwl+kcfvL+BIfuqCe61xBhgG wOSaMe7svvyTTJFbKgQM1rSLksimAVe4W1v7qVItOSCfyiBntGn/suaj8bnR6zDO46qP y56jbvN6c1G0iv1cPjATITu6w8t15tcGTgtjDkR9L6yvBPYHnsmJQ12oUCDUtBw7lYXW E2W9HVapcYNUhzl45IZIpvDqOcVUIFdr1aLATk4Gsbf9uOnZUsellgYwSb/klauH9umm 2YqQ== X-Received: by 10.67.22.97 with SMTP id hr1mr69258670pad.49.1451333416902; Mon, 28 Dec 2015 12:10:16 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id g88sm43668671pfj.91.2015.12.28.12.10.15 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 28 Dec 2015 12:10:16 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 2D13711B72FEC; Mon, 28 Dec 2015 12:10:15 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Fri, 25 Dec 2015 23:35:14 -0500") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: Stefan Monnier , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::22b 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:197033 Archived-At: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable >>>>> Stefan Monnier writes: > I just tried to merge from emacs-25 to master, via gitmerge.el. Just to l= et > 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? 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. =2D-=20 John Wiegley GPG fingerprint =3D 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGcBAEBCgAGBQJWgZcjAAoJEMFE2PTxn+YwiLUMAJvF0U63zQFmK7rPPh53MSaK p3EMPn0KV/DFT4LSHBgTS7nPoy6u0Ga1GMLh1nKvYDVMIvBPO4jdVJ55rGJXpur+ nkGLbPfWcW8/3wbniTgIcvbFHWZ7ydTrzo39wrGCwNMEVUf1f9sgjymrjfMY2LJe q/nOBrgHXKnAuzLJb+uank9JYuVFsl1mxlC8ndC7090YFteJr1BIqdD3P0bxUmwe 51/tTBgVMakkjUc5WeW5qk5pyBaROrHJLXvqcmZgvr+XvT3F9tLr3JPHbA3NqBa8 mKAT8Y3vhAiXi0APIWnOxGpxoSgy7rrLb1GvYIiAigG78lc2yU5BzeS8K3NiBPD5 /gzCx0MTrbbVHQL9u1AjHRKsrSNYZZmgrq11PrrRkdNus/QemkKkxMj0eIarJv5l eFlkCOw7nxQFHs8fpJ5rXxLFDXIsgt/Hnd9dQYdSG1lLz81s/YC7rYlHXKvx0DGm /a2a12sWMmJhUqKKLdUas91iyivW/SgDiDX8a6T3sg== =BbtK -----END PGP SIGNATURE----- --=-=-=--