[Bf-committers] Request for a branch of the 2.5 branch

[Tamito KAJIYAMA]

I used TortoiseSVN on XP together with the option for ignoring
newline changes (thanks Nathan for the suggestion!).  The merge
was successful, and the merged tree compiled without errors.

Regards,

-- 
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>


----- Original Message ----- 
From: "joe" <joeedh at gmail.com>
To: <jesterking at letwory.net>; "bf-blender developers" <bf-committers at blender.org>
Sent: Thursday, September 10, 2009 1:56 AM
Subject: Re: [Bf-committers] Request for a branch of the 2.5 branch


This doesn't work.  I've attached the py script I use to detect
inconsistent newlines.  Just run it from the root blender dir.  It
requires py 2.x.

Joe

On Wed, Sep 9, 2009 at 5:36 AM, Nathan Letwory <jesterking at letwory.net> wrote:
> 2009/9/9 Maxime Curioni <maxime.curioni at gmail.com>:
>> We are facing weird issues with line endings, with the following error;
>>
>> svn: File 'release/scripts/
>> scripttemplate_metaball_create.py' has inconsistent newlines
>> ...
>>
>
> I think you should be able to use --ignore-eol-style on the
> command-line for this. (And in TortoiseSVN there is an option to
> ignore whitespace changes).
>
> /Nathan
> _______________________________________________
> 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
>