[Bf-committers] Tortoise SVN patching issues

[pete larabell]

lol. Yeah it has (for me anyway) a much nicer feel when editing python
files. Add that to the fact that it's at LEAST 100x smaller, installs fast,
and it's portable, and it's a must have for quick blender tweaks on Windows
:)



On Mon, Oct 4, 2010 at 12:33 PM, <raulf at info.upr.edu.cu> wrote:

> Thanks Peter!
>
>  VC++ has the option to check for Windows , Mac OS and Unix line ending
> styles too :)
>
>  but having Notepad++ around is a good advice :)
>
>
>
> > Indeed that is a problem with getting svn sources and editing in some
> > Windows editors.
> >
> > Using something (free) like Notepad++ that not only can show you both
> > (CR+LF) the Windows line ending characters sitting there, but can also do
> > search/replace for such characters, plus has native support for
> converting
> > all line endings to and from "dos/unix" is invaluable.
> >
> > It seems easiest IMHO to work in an editor that natively supports editing
> > with "unix" line endings... Makes for less headaches when doing anything
> > such as stated in the original email.
> >
> > Peter
> >
> > On Mon, Oct 4, 2010 at 11:26 AM, Martin Poirier <theeth at yahoo.com>
> wrote:
> >
> >>
> >>
> >> --- 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
> >>
> >>
> >> _______________________________________________
> >> Bf-committers mailing list
> >> Bf-committers at blender.org
> >> http://lists.blender.org/mailman/listinfo/bf-committers
> >>
> > _______________________________________________
> > Bf-committers mailing list
> > Bf-committers at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-committers
> >
>
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>