From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?Aur=C3=A9lien_Aptel?= Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Mon, 9 Nov 2015 11:40:06 +0100 Message-ID: References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1447065616 656 80.91.229.3 (9 Nov 2015 10:40:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2015 10:40:16 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 11:40:15 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 1Zvjrz-0003JE-Jv for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 11:40:15 +0100 Original-Received: from localhost ([::1]:51571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvjry-0004eo-Te for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 05:40:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvjru-0004aL-3H for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:40:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvjrs-00063R-Ok for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:40:10 -0500 Original-Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:35986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvjrs-00062w-EJ for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:40:08 -0500 Original-Received: by lfs39 with SMTP id 39so66539410lfs.3 for ; Mon, 09 Nov 2015 02:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=eJE1wtSokQ6Rm2Dy+/LaqxGrZS9yaxJpMhULKtVpnls=; b=fDV0aB3GRxj5yWm6D7e0KeQ19Gf0lJCz0rwuOG0buTvnRQvgltI/ycNWhOnDVymNUO jIoL1DYAg15NKyA6NIBFINzvC7dX3Ufa+caaWQhRI8KtzZEid6Zr+jwFWvikpDNbWelA Yolb0io8DcMBmm+KLF2kDlBqnaY5vyHIcvhzdU1//zgrkS1FvFeV4JT+SA1UeaeUO8eE +ib03eeUvnOvbu+dAJsA697nD3FNRkYRIEF0DKwZQ8AEd2aV0lmKbk7APPG9FKvGYBMX 3E1otgUzsJV7X85j3bLctbuhwPO7GOk9am6m7xxM3ID+ToEyHVhsAhEz3lOKrmcJZIhy TkSw== X-Received: by 10.25.85.193 with SMTP id j184mr8201859lfb.2.1447065606683; Mon, 09 Nov 2015 02:40:06 -0800 (PST) Original-Received: by 10.112.160.133 with HTTP; Mon, 9 Nov 2015 02:40:06 -0800 (PST) In-Reply-To: <8737wgw7kf.fsf@lifelogs.com> X-Google-Sender-Auth: osLDuOT9szIN0Wor0Y4qTUEv_xM X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::233 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:193697 Archived-At: On Sun, Nov 8, 2015 at 9:38 PM, Ted Zlatanov wrote: >>> Agreed. Aur=C3=A9lien, the diff is huge and there are many conflicts. I= t >>> looks like the fork from master happened in February 2015 and you're >>> simply out of date. Can you please rebase against the emacs.git >>> origin/master? Last push... I already merged master in my branch at some point, and did so with `merge --squash` IIRC, note to self: never do that again. Turns out it made any subsequent master merge a lot harder, sorry for that. The weird thing is most conflicting changes where actually identical but git couldn't tell. The diff were the same on both side but git couldnt tell they were from the same commits since they were squashed. > PS> Please check > PS> https://github.com/phst/emacs-dynamic-module/tree/dynamic-modules-2, = it > PS> should have the current master merged in. > PS> Unfortunately I can't test that right now because for some reason mak= e is > PS> incredibly slow on my machine after the merge. > > Sorry, Philipp, I don't know how you and Aur=C3=A9lien have collaborated = in > the past, and I've considered Aur=C3=A9lien's code authoritative. I don't > want to bypass his review and approval, so maybe you can work with him > on that? It will save us time instead of reviewing several times. We've been working together on github, I've just merged his code.