From: Bill B. <bb...@co...> - 2002-03-25 22:07:47
|
That can still cause conflicts or, at least, lead to situations where a conlict occurs that could be otherwise avoided. The problem is that the contextual diff includes 2 or 3 lines *before* and *after* any change. So, the diff will include a few extra rules in the one-liner version in any given diff. By adding all the // 020 stuff, you ensure that any random diff chunk will only contain ONE rule (or just the rules that changed). BTW: Still need to address any goofy characters in the rules-- i.e. newlines and such. On Monday, March 25, 2002, at 04:30 PM, Anjo Krank wrote: > But with the perl script that makes one rule/line you get: > > .... > Which should not make any conflicts that are a problem. > b.bum No Chunks... ... No Foul! |