New submission from Nick Coghlan <ncogh...@gmail.com>: The diff generator seems to get confused when the most recent merge with default was via a different branch: http://bugs.python.org/issue11682
The pep380 branch in my BitBucket sandbox depends on the new feature in the get_opinfo branch, so the merge flow is currently: default->get_opinfo->pep380 (I haven't closely examined the patch I just generated, but it still didn't look right on an initial glance) ---------- messages: 2312 nosy: loewis, ncoghlan priority: bug status: unread title: Patch generator and dependent feature branches _______________________________________________________ PSF Meta Tracker <metatrac...@psf.upfronthosting.co.za> <http://psf.upfronthosting.co.za/roundup/meta/issue428> _______________________________________________________ _______________________________________________ Tracker-discuss mailing list Tracker-discuss@python.org http://mail.python.org/mailman/listinfo/tracker-discuss