[Tracker-discuss] [issue428] Patch generator and dependent feature branches
Martin v. Löwis
metatracker at psf.upfronthosting.co.za
Wed Nov 30 09:15:18 CET 2011
Martin v. Löwis <martin at v.loewis.de> added the comment:
The diff generator will always generate a patch against some revision of cpython. IIUC, you would want it to diff against a base revision that is *not* in cpython.
I'm doubtful that this is a desirable feature:
a) your patch cannot be applied as-is to cpython, as you would need to commit the feature it depends on first.
b) the Rietveld integration would not be able to locate the base revision of the patch, since it's not in cpython.
AFAICT, the generated patch is then correct, in the sense of above: it *is* the patch that needs to be applied to cpython to integrate the pep380 branch into Python.
If/when get_opinfo gets merged into cpython first, you may be confronted with a tricky merge operation, since the change set from default will duplicate what you have merged/branched-off already (most likely, hg will figure out that this is the very same changes twice). Creating a patch then will show just the changes of your branch.
I was considering adding UI for a "base" branch, but it wouldn't have occurred to me that the base branch may not exist in cpython. We would then also need the notion of a "base repository".
status: unread -> chatting
PSF Meta Tracker <metatracker at psf.upfronthosting.co.za>
More information about the Tracker-discuss