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 15:52:02 +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> <87io5bv1it.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 1447080816 26930 80.91.229.3 (9 Nov 2015 14:53:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2015 14:53:36 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 15:53:24 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 1Zvnox-00078v-D6 for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 15:53:23 +0100 Original-Received: from localhost ([::1]:53212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvnow-0002jI-HH for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 09:53:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvnng-0001LB-El for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:52:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvnnf-00054C-Lw for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:52:04 -0500 Original-Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:35683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvnnf-000542-FY for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:52:03 -0500 Original-Received: by lbces9 with SMTP id es9so30566582lbc.2 for ; Mon, 09 Nov 2015 06:52:02 -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=nYUxKOEIoYWUsPk6kPf2311ii0rZVkR8HJARs+eQSQ0=; b=p2xAk/M1sAHLHNoxw6kgo9IRc1lc3gtUkCQIB3DTtcWjcWEY5u7HNTda1PPImJuVVR 1ej0xG54oc2r9xKWcMrzRKM1lMa4dA10GHDBRNJsyx9pYn6X0YVjSTppXdHswqjXEODy w0cFi3/64zIHnLOB9F/qTTyzX/ozbNKpnQdsCgh2GpfEQooUMyOs8rwDvzmdRQ/QeqKR BRdwGsJxharkaF89Xd9AwDIRvuLHJwi2FR9uD1Or8hh7JnD9zyBo/MyguB8F4Ov7wSf9 7RUoSQWOjRRlGJQko0leaCSeIwe90PH3JJVqBRSelDd+DFPB//2HXXvaJdgRNIr7bp90 en/w== X-Received: by 10.112.236.8 with SMTP id uq8mr15152932lbc.116.1447080722530; Mon, 09 Nov 2015 06:52:02 -0800 (PST) Original-Received: by 10.112.160.133 with HTTP; Mon, 9 Nov 2015 06:52:02 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: Gaan8UlbvgmX7ZFBuc_rTpbvVoI X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22c 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:193710 Archived-At: On Mon, Nov 9, 2015 at 3:26 PM, Aur=C3=A9lien Aptel wrote: > After merging master in the branch i can simply use a diff between the > 2 (which shouldnt include conflicting/redundant changes this time) as > what I'll use to make the new clean branch. So assuming master was successfully merged in dynamic-modules-2: git diff master dynamic-modules-2 > dyn.patch git checkout -b dynamic-modules-3 master git apply dyn.patch # now make a series of commit splitted in a way that makes sense git add -p FILE.. git commit etc.