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 13:27:00 +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 X-Trace: ger.gmane.org 1447072033 8431 80.91.229.3 (9 Nov 2015 12:27:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2015 12:27:13 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 13:27:12 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 1ZvlXT-0004lh-PW for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 13:27:11 +0100 Original-Received: from localhost ([::1]:52169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvlXN-0005wU-VE for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 07:27:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvlXL-0005wO-DG for emacs-devel@gnu.org; Mon, 09 Nov 2015 07:27:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvlXK-0005KD-6D for emacs-devel@gnu.org; Mon, 09 Nov 2015 07:27:03 -0500 Original-Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:35560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvlXJ-0005K4-SW for emacs-devel@gnu.org; Mon, 09 Nov 2015 07:27:02 -0500 Original-Received: by lbces9 with SMTP id es9so27577816lbc.2 for ; Mon, 09 Nov 2015 04:27:01 -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; bh=2U5nPIAgRiB7aof/9SubmNpMUeykxQZ3ZYbW28GlQTM=; b=AITLxCW800k13wLNaZroj8YqKkZBulXQksF1iw81xNserb8FZDjhPKwKYUxu0XIPGO kN3tCNgtEVxkY/fIkBl43OhM318qd88pNQo8Qw+ntfCK0pDKngCSahclZ27rZ/8/7LjZ MSzBKnfEk4w/xBYJetflgQkyYb7LfUTDn1zYg9nZxzoB0dzLCQGDjmwWSkVU2/PmXO89 Ac6X5WAtWqK9omV0cvchiRpyAihds6zqASb463sMDGLbl90YRp0cA4OrL9eKGe53zhfv TVoLubTzTmIijgz33eXwhhes2mkgPXBbI1VVV2Dzs9zBHBUpzLozmfnx2A6d881sriUE S3qg== X-Received: by 10.112.236.8 with SMTP id uq8mr14723940lbc.116.1447072020954; Mon, 09 Nov 2015 04:27:00 -0800 (PST) Original-Received: by 10.112.160.133 with HTTP; Mon, 9 Nov 2015 04:27:00 -0800 (PST) In-Reply-To: <87io5bv1it.fsf@lifelogs.com> X-Google-Sender-Auth: ZtEuUdAY34TSCTPQCGtPk-mSTFI X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22e 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:193702 Archived-At: On Mon, Nov 9, 2015 at 12:46 PM, Ted Zlatanov wrote: > I checked this branch: `git fetch git@github.com:aaptel/emacs-dynamic-module.git dynamic-modules-2`? Correct > It's not been rebased against origin/master and there are many small > commits. I don't actually know what's the policy on merging such a major > branch from a non-committer[1]: should I rebase, squash, or preserve the > history? Does anyone know? Whatever you do, I don't think its useful to preserve the history of my branch. I would suggest maybe splitting commits for the most invasive changes (throw/signal, Fload/load-suffixes, new user_ptr type) and import the completely new stuff in a single commit (all the content of modules/ basically). I know Philip tried to write Changelog entries for some commits in the commit message that can be re-used. If can try to make a new branch that can be re-based on master with the commits I had in mind if you want. > I also don't know if Philipp, who has many changes in that branch, has > signed the contributor papers. I thought he did, but I cannot find any commits on master from him so I guess he didn't.