Pyhton module initializations

Questions, problems and discussion about compiling FreeOrion.

Moderators: Oberlus, Oberlus

Message
Author
User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 12688
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: Pyhton module initializations

#16 Post by Geoff the Medio » Thu Oct 04, 2012 2:03 am

TortoiseSVN refuses to apply your patch. It's small enough that I can do it by hand with hopefully no errors, but could you make sure you're using an SVN diff when making any future patches?

cazfi
Space Floater
Posts: 42
Joined: Thu May 28, 2009 10:08 pm

Re: Pyhton module initializations

#17 Post by cazfi » Thu Oct 04, 2012 11:06 pm

Geoff the Medio wrote:TortoiseSVN refuses to apply your patch. It's small enough that I can do it by hand with hopefully no errors, but could you make sure you're using an SVN diff when making any future patches?
Weird. It is made with svn diff. Maybe problem with it being relative to wrong directory? Or Unix/Windows line endings issue?

User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 12688
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: Pyhton module initializations

#18 Post by Geoff the Medio » Thu Oct 04, 2012 11:22 pm

cazfi wrote:Weird. It is made with svn diff. Maybe problem with it being relative to wrong directory? Or Unix/Windows line endings issue?
It automatically tries to find the right directory, but whether I do it manually, let it try automatically, or edit the file to remove the leading FreeOrion because it doesn't consider the directory that contains the FreeOrion directory to be a valid repository, it just pops up with an empty list of files to modify. The line-endings might be the problem; they have inconsistently been an issue... Though in this case it don't even list the file as having rejected chunks, which I would expect in that case; it just shows no files being modified when attempting to apply the patch.

cazfi
Space Floater
Posts: 42
Joined: Thu May 28, 2009 10:08 pm

Re: Pyhton module initializations

#19 Post by cazfi » Fri Oct 05, 2012 5:17 am

> svn proplist client/AI/CMakeLists.txt
returns no properties - so there's no eol-style set at all for it - I expected "native". It seems to be in unix format.

User avatar
Geoff the Medio
Programming, Design, Admin
Posts: 12688
Joined: Wed Oct 08, 2003 1:33 am
Location: Munich

Re: Pyhton module initializations

#20 Post by Geoff the Medio » Fri Oct 05, 2012 5:25 am

My version (on Windows 7) also has Unix line endings.

cazfi
Space Floater
Posts: 42
Joined: Thu May 28, 2009 10:08 pm

Re: Pyhton module initializations

#21 Post by cazfi » Sat Oct 06, 2012 5:37 am

Geoff the Medio wrote:My version (on Windows 7) also has Unix line endings.
Yes, since eol-style property is not set, all clients receive literally what's in server so it's same for everyone regardless what system they run.

Post Reply