[sldev] Patch format question

[Soft]

On Tue, May 6, 2008 at 1:17 PM, Felix Duesenburg <kfa at gmx.net> wrote:
> Hi @ (esp. Linden Devs),
>
>  This may be a very little thing but I'm wondering if it would cause any trouble to loosen up the guidelines for the format of submitted patches.
>
>  Not sure how many others use a similar setup to work with. I keep a local svn repository where I check in a newly downloaded source version, then I just fix the project files and commit them. For me it would be so much more convenient if I could just use my TortoiseSVN to create patches from there instead of having to do a command line diff. To make a diff patch, I have to export first and then still watch what goes into it and what not and this is error-prone late at night, or early before the second cup of coffee ;).
>
>  If instead of this:
>
>  diff -ruN -x .svn -x '*.vcproj' -x '*.sln' linden-orig/indra/newview/app_settings/settings.xml linden/indra/newview/app_settings/settings.xml
>  --- linden-orig/indra/newview/app_settings/settings.xml 2008-04-27 07:05:17.687500000 -0400
>  +++ linden/indra/newview/app_settings/settings.xml      2008-04-27 07:09:50.156250000 -0400
>
>  ... you get this:
>
>  Index: indra/newview/app_settings/settings.xml
>  ===================================================================
>  --- indra/newview/app_settings/settings.xml     (revision 4)
>  +++ indra/newview/app_settings/settings.xml     (working copy)
>
>  ... would it really disrupt anyone's patterns? I believe you'd have to do some search-and-replace anyway most of the time before a patch can be applied. In the former case the directories may not match, in the latter the revision numbers.

A svn diff is fine. patch accepts that as input without any problems.
ToirtoiseSVN's diff output is fine as well. It needs a little cleanup
because it mixes line ending styles between the header and the body,
but that's trivial for the importer to fix.