Per Dal?n wrote:
>>
>>>> Regarding changes like:
>>>>
>>>> +++ lib/libdvbsi/channels.c 18 Oct 2005 16:44:42 -0000
>>>> @@ -102,7 +102,6 @@
>>>> static int parse_param(char *val, const param *p_list, int list_size)
>>>> {
>>>> int i;
>>>> -
>>>> for (i = 0; i < list_size; i++) {
>>>> if (strcasecmp(p_list[i].name, val) == 0)
>>>> return p_list[i].value;
>>>>
>>>> Please avoid whitespace only changes. They make merging multiple
>>>> branches hellish.
>>>
>>
>>
>> Strange, I though diff -ub would ignore that. I'll keep it in mind
>> though.
>>
>
> You need to do diff -ubB to get it ignore blank lines.
>
Doesn't work like that. Even though diff won't flag the lines
as being changed (!, -, +...) they will still be different, and hence
"patch" won't be able to match them up with context in the
target file...
The only safe thing to do is to avoid whitespace changes, and
not use -w or -b.
-Philip
