From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Sun, 08 Nov 2015 13:39:15 +0000 Message-ID: References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=047d7bf0d14cd96c770524079a6b X-Trace: ger.gmane.org 1446989971 23785 80.91.229.3 (8 Nov 2015 13:39:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 Nov 2015 13:39:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 08 14:39:31 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 1ZvQBv-0004kR-6g for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 14:39:31 +0100 Original-Received: from localhost ([::1]:47423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQBu-0004jh-3h for ged-emacs-devel@m.gmane.org; Sun, 08 Nov 2015 08:39:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQBq-0004jN-Er for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:39:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvQBp-0006aI-IG for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:39:26 -0500 Original-Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:37007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvQBp-0006aE-C9 for emacs-devel@gnu.org; Sun, 08 Nov 2015 08:39:25 -0500 Original-Received: by wiva10 with SMTP id a10so19542550wiv.0 for ; Sun, 08 Nov 2015 05:39:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :content-type; bh=ENf0TryecjOwvi5NkjIvSswPYUXMD0nKvuFHbsloXdM=; b=DIc+CU0xBaVDKjkPpEIVlcGlWDYDzz79eDr6H25gIAuo+s1HrMlLvFnG3iVAiLbLTU wq5A1PCD+8OMhv004HIlDFypyuHDD+mpRm1cCa1lb71wajBEZkBiDO8vRC6LXxSq44PH cPRb6D5mGIOayHiGhGizsq4tnsRJkztqmF+qJFYmD8TqzcCgAb1yua+EyzJZ5xsy5qbR tlXc8+Bv0mK1rKDJ4YstT6LTll5YDZfZutpRKViXXmv8Yjwh47PsYjuNGGTmuT9j63Is dVVNHbgFMrUHkHGcBrKLY0zNnMn4GpGz4hkvPSi3g4JrN3rnGzqbV1r5p0p+XQRvkvKO ePPg== X-Received: by 10.194.91.164 with SMTP id cf4mr24468017wjb.139.1446989964862; Sun, 08 Nov 2015 05:39:24 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 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:193610 Archived-At: --047d7bf0d14cd96c770524079a6b Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Steinar Bang schrieb am So., 8. Nov. 2015 um 13:55 Uhr: > >>>>> Philipp Stephani : > > In order to produce a clean patch, I tried merging the master (from > > emacs-mirror) or emacs-24 branch, but both produced too many merge > > conflicts (even in files untouched by the module code). > > What kind of conflicts in what files? Could you provide some detail? > > Basically everywhere (more details probably wouldn't help). > What was the command line sequence you used to do the merges from master > and emacs-24? > > > I've added the GitHub emacs-mirror as origin, merged the to the master of Aur=C3=A9lien's fork, and then tried to merge that into the dynamics-module= -2 branch. All with plain 'git merge'. However, I now managed to produce a two-step merge that didn't produce additional conflicts. I've now also merged in the Savannah master and pushed the result to my fork. --047d7bf0d14cd96c770524079a6b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


Steina= r Bang <sb@dod.no> schrieb am So., 8= . Nov. 2015 um 13:55=C2=A0Uhr:
>= >>>> Philipp Stephani <p.stephani2@gmail.com>:
> In order to produce a clean patch, I tried merging the master (from > emacs-mirror) or emacs-24 branch, but both produced too many merge
> conflicts (even in files untouched by the module code).

What kind of conflicts in what files? Could you provide some detail?


Basically everywhere (more details pro= bably wouldn't help).=C2=A0
=C2=A0
What was the command line sequence you used to do the merges from master and emacs-24?



I've added the GitHub emacs-mirror= as origin, merged the to the master of Aur=C3=A9lien's fork, and then = tried to merge that into the dynamics-module-2 branch. All with plain '= git merge'.
However, I now managed to produce a two-step merg= e that didn't produce additional conflicts. I've now also merged in= the Savannah master and pushed the result to my fork.=C2=A0
--047d7bf0d14cd96c770524079a6b--