* Attempting to graft the Aquamacs commits
@ 2014-03-23 8:09 Eric S. Raymond
2014-03-23 10:32 ` David Reitter
0 siblings, 1 reply; 3+ messages in thread
From: Eric S. Raymond @ 2014-03-23 8:09 UTC (permalink / raw)
To: David Reitter; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Attempting to graft the Aquamacs commits
2014-03-23 8:09 Attempting to graft the Aquamacs commits Eric S. Raymond
@ 2014-03-23 10:32 ` David Reitter
2014-03-23 10:52 ` Eric S. Raymond
0 siblings, 1 reply; 3+ messages in thread
From: David Reitter @ 2014-03-23 10:32 UTC (permalink / raw)
To: Eric S. Raymond; +Cc: emacs-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Attempting to graft the Aquamacs commits
2014-03-23 10:32 ` David Reitter
@ 2014-03-23 10:52 ` Eric S. Raymond
0 siblings, 0 replies; 3+ messages in thread
From: Eric S. Raymond @ 2014-03-23 10:52 UTC (permalink / raw)
To: David Reitter; +Cc: emacs-devel
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-23 10:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-23 8:09 Attempting to graft the Aquamacs commits Eric S. Raymond
2014-03-23 10:32 ` David Reitter
2014-03-23 10:52 ` Eric S. Raymond
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).