Attempting to graft the Aquamacs commits

Attempting to graft the Aquamacs commits

[Eric S. Raymond]

Selecting the right set of commits out of the Aquamacs repo is proving
to be a significant problem.  The way the merges were done confuses my
branch-detection logic.

Will I get the right set of commits if I select on "David Reitter" as
the author?
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

The difference between death and taxes is death doesn't get worse
every time Congress meets
	-- Will Rogers

Re: Attempting to graft the Aquamacs commits

[David Reitter]

[-- Attachment #1: Type: text/plain, Size: 979 bytes --]

On Mar 23, 2014, at 4:09 AM, Eric S. Raymond <esr@thyrsus.com> wrote:

> Selecting the right set of commits out of the Aquamacs repo is proving
> to be a significant problem.  The way the merges were done confuses my
> branch-detection logic.

Typically, I would merge in changes from branches named emacs23 and emacs24 (which were the mainline code).  
I wonder what is confusing about that - is there anything non-standard regarding this?

> Will I get the right set of commits if I select on "David Reitter" as
> the author?

All merges were done by me, and the author field should be correct.
However, a number of commits stem from various other authors; sometimes with them as author and signed off by me, oftentimes committed by them directly.

I’m not sure what the issue is; I thought I was consistent with the merges and the order of rev-ids in each merge should be the same.
I could try to compile a list of Aquamacs contributors if that would help.


[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4151 bytes --]

Re: Attempting to graft the Aquamacs commits

[Eric S. Raymond]

David Reitter <david.reitter@gmail.com>:
> All merges were done by me, and the author field should be correct.
> However, a number of commits stem from various other authors;
> sometimes with them as author and signed off by me, oftentimes
> committed by them directly.

That might explain what I'm seeing.  Perhaps my commit select is
working after all.  

I'm enclosing a mailboxized list of comments for commits I found on the
aquamacs3 branch. Please check that this is correct, and if so remind me
of what other branches need to be extracted and grafted.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>