[python-committers] cherry picking, miss islington, and generated files

[Barry Warsaw]

On Feb 2, 2018, at 20:40, Mariatta Wijaya <mariatta.wijaya at gmail.com> wrote:
> 
> Sure, I sort of asked this in the past: what are the generated files, how to identify them, is there a pattern?

I’m not sure there’s going to be a pattern so much as a list of such files.

> I need to dig up that thread and find out if anyone answered. It's been a while :)

Cool, thanks!  I definitely missed the discussion the first time around.

> Usually there would be conflict in backport though. It was suggested that cherry-picker can regenerate the files and resolve the conflict.
> Your suggestion of having miss Islington comment on the PR sounds good too.

In my case, there was no conflict, although I actually thought there might have been one.  But I was still uncomfortable not manually regenerating those files anyway.  The 3.6 auto-merge did have conflicts because the commit touched a file that doesn’t exist in 3.6, but cherry_picker worked beautifully so it wasn’t difficult to resolve.

I don’t think this is a common situation, since importlib is a bit more of an esoteric part of the stdlib, and cherry picking fixes in it is probably even more rare.  At least it’s something to be aware of, and anybody who changes importlib will already know they have to do something special (i.e. regenerate the files).

Thanks for your great work on these tools Mariatta!

Cheers,
-Barry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://mail.python.org/pipermail/python-committers/attachments/20180203/78510c80/attachment.sig>