Front page | perl.perl5.porters |
Postings from July 2012
* Karl Williamson <public@khwilliamson.com> [2012-07-24T23:40:10] > commit 4a74e76e73e572730d22e6798970f5981a893f48 > Merge: 53335a3 6bd66ee > Author: Karl Williamson <public@khwilliamson.com> > Date: Tue Jul 24 21:39:32 2012 -0600 > > Merge branch 'blead' of ssh://perl5.git.perl.org/perl into blead Two things... First, the landed khw/invlist branch looks (by its commit messages) to be great stuff. I'm excited! Secondly, the merging here made just a bit of a mess. This is the history graph where the merges happened: * [513f78f] op.c:op_free: Rmv dead code; simplify cop_free logic * [4a74e76] Merge branch 'blead' of ssh://perl5.git.perl.org/perl into blead |\ | * [6bd66ee] In Perl_magic_setenv() s/ptr/key/ in two pieces of ... * | [53335a3] Merge branch 'khw/invlist' into blead |\ \ | |/ |/| | * [a0a0694] regcomp.c: Revise bracketed char class optimizations My assumption here is that 53335a3 was made locally, then could not be pushed because 6bd66ee had become the new public blead. 4a74e76 was then made and pushed. Instead, 53335a3 should have been discarded and a new merge commit with both a0a0694 and 6bd66ee as its parents should have been made. That is, the history should've looked like: * [???????] op.c:op_free: Rmv dead code; simplify cop_free logic * [???????] Merge branch 'khw/invlist' into blead |\ | * [a0a0694] regcomp.c: Revise bracketed char class optimizations * | [6bd66ee] In Perl_magic_setenv() s/ptr/key/ in two pieces of ... In this case, the complication is minor and the likely burden on future bisectors is similarly minor, but we should all remain mindful of these kind of messy merges, since they're so very easy to avoid. ...but mostly I'm excited about the invlist changes. Thanks! -- rjbsThread Next