On 11/02/12 23:42, Pete Wyckoff wrote:
I'll send along a bunch of test cases I wrote to play around with this. Your case had too many moving parts for me to understand. If there's something in there that isn't covered, maybe you can factor it out into something small? Feel free to merge any of my code in with a future resubmission.
Thanks - I'm glad you like it! I'll rework it with your code and resubmit.
Some comments in this code below: This is a novel approach too. Instead of just guessing that keywords are causing the conflict, inspect the diff for context or edited lines containing keywords. Or we could just always scrub every file before even trying to apply patches.
I guess scrubbing every file could get quite slow. We have people checking in hundreds of megabytes of C test vectors....
In a few spots I see you've taken the ":" out of the regex. This will match strings like $Idiot$ that shouldn't be keyword expanded.
Good point - I'll put the ':' back.
Impressed.
Thanks! Updated patch series to follow. Luke -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html