Re: Dynamic loading progress

[Ted Zlatanov <tzz@lifelogs.com>]

On Mon, 9 Nov 2015 13:27:00 +0100 Aurélien Aptel <aurelien.aptel+emacs@gmail.com> wrote: 

AA> On Mon, Nov 9, 2015 at 12:46 PM, Ted Zlatanov <tzz@lifelogs.com> wrote:
>> I checked this branch: `git fetch git@github.com:aaptel/emacs-dynamic-module.git dynamic-modules-2`?

AA> 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?

AA> Whatever you do, I don't think its useful to preserve the history of
AA> my branch. I would suggest maybe splitting commits for the most
AA> invasive changes (throw/signal, Fload/load-suffixes, new user_ptr
AA> type) and import the completely new stuff in a single commit (all the
AA> content of modules/ basically). I know Philip tried to write Changelog
AA> entries for some commits in the commit message that can be re-used. If
AA> can try to make a new branch that can be re-based on master with the
AA> commits I had in mind if you want.

Yes, please go ahead if you can. You know best which commits are
"milestones" and which are not worth preserving. The rebasing can be
part of your work.

>> I also don't know if Philipp, who has many changes in that branch, has
>> signed the contributor papers.

AA> I thought he did, but I cannot find any commits on master from him so
AA> I guess he didn't.

That could be a problem, unfortunately.  Let's wait for Philipp to
comment.

Ted