zk-merger-pr.py and PR 1444

[Benjamin Reed <br...@apache.org>]

i found an interesting issue when merging PR 1444: an unintended
icloud email popped up. (it looks like the simple retrigger commits
were done with that email.) i thought i could override it with the
author prompt but that only adds authors. i ended up modifying the
script slightly to account for it. i'm wondering if others have run
into this issue.

ben

Re: zk-merger-pr.py and PR 1444

[Damien Diederen <dd...@apache.org>]

Hi Benjamin,

> i found an interesting issue when merging PR 1444: an unintended
> icloud email popped up. (it looks like the simple retrigger commits
> were done with that email.)

That PR is a bit interesting, indeed:

 1. It contains a merge;
 2. Most of the commits were authored using an "iCloud" email address.

Your merge attributes it to a "Gmail" email address of Ching-Chan Lee's,
and I have absolutely no idea where that one comes from :)

As for the merge, I did not know the merge script could deal with
those.  Or did it work by accident?

> i thought i could override it with the author prompt but that only
> adds authors.

Right.  I've been surprised by that in the past.

> i ended up modifying the script slightly to account for it. i'm
> wondering if others have run into this issue.

Not on such a complex case, but I remember having to restart a merge
because of unwanted entries.  (Unfortunately, I don't remember how I
worked around it.)

Cheers, -D