[Bf-committers] Tortoise SVN patching issues

[Martin Poirier]

--- On Mon, 10/4/10, Campbell Barton <ideasman42 at gmail.com> wrote:

> From: Campbell Barton <ideasman42 at gmail.com>
> Subject: Re: [Bf-committers] Tortoise SVN patching issues
> To: "bf-blender developers" <bf-committers at blender.org>
> Received: Monday, October 4, 2010, 11:56 AM
> On Mon, Oct 4, 2010 at 2:54 PM, 
> <raulf at info.upr.edu.cu>
> wrote:
> > hi all :)
> >
> >  I'm using TortoiseSVN on Windows 7 but when I try to
> generate a patch
> > from the changes I made I get this error:
> >
> >   File (C:\Blender.... any file here) has
> inconsistent newlines
> >   Inconsistent line ending style
> >
> >  and it cancels the patch making :(
> >
> >  How could I solve this? Is very important because I
> have lost track of
> > all the source files I have changes so make it by hand
> would be
> > impossible.
> 
> An alternative is to install cygwin & svn then do this
> in the blender
> source directory.
>  svn diff > mypatch.diff

If there are inconsistent line endings in the file, that's not going to help.

You need to make sure that your source files use a single line ending mode throughout the whole file (\n or \r\n, not a mix of both).

Your text editor might have a function to correct that.

Martin