Code::Blocks Forums

Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => Topic started by: stahta01 on November 22, 2006, 11:13:41 am

Title: Please mark file(s) as svn:eol-style native
Post by: stahta01 on November 22, 2006, 11:13:41 am
I am having svn diff issues with the files src/src/wxAUI/manager.h, src/src/wxAUI/manager.cpp, and src/plugins/contrib/keybinder/keybinder.cpp.

All I know is my wxw2.8.0 patches are complaining that the line endings.

Can you mark them as native svn:eol-style?

This may be the way you do it.

svn propset svn:eol-style native src/src/wxAUI/manager.h
svn propset svn:eol-style native src/src/wxAUI/manager.cpp
svn propset svn:eol-style native src/plugins/contrib/keybinder/keybinder.cpp

Edit: No hurry on this, I just thought it should be done before I resubmit my updated patches.
Note: Till it is fixed you must use svn.exe diff --extensions --ignore-eol-style in order to keep the patch files small.

Thanks
Tim S
Title: Re: Please mark file(s) as svn:eol-style native
Post by: afb on November 22, 2006, 11:54:00 am
I've just done liberal amounts of dos2unix and unix2dos instead...
(i.e. seeing the same issues, just worked around them for now)
Title: Re: Please mark file(s) as svn:eol-style native
Post by: Game_Ender on November 22, 2006, 09:48:48 pm
The best way is to just have the SVN client do this automatically, its a config options.
Title: Re: Please mark file(s) as svn:eol-style native
Post by: stahta01 on November 22, 2006, 11:29:00 pm
Quote from: Game_Ender on November 22, 2006, 09:48:48 pm
The best way is to just have the SVN client do this automatically, its a config options.

Thanks, I was thinking it was a server only setting.

I found this link that helped me http://eiffelsoftware.origo.ethz.ch/index.php/Subversion_Settings#Windows

REGEDIT4

[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config]

[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\auto-props]
"*.cpp"="svn:eol-style=native"
"*.h"="svn:eol-style=native"

[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config\miscellany]
"enable-auto-props"="yes"

Tim S
Title: Re: Please mark file(s) as svn:eol-style native
Post by: MortenMacFly on November 22, 2006, 11:43:30 pm
Quote from: stahta01 on November 22, 2006, 11:29:00 pm
REGEDIT4
[HKEY_CURRENT_USER\Software\Tigris.org\Subversion\Config]
[...]
Oh no! Don't tell me the SVN command-line tool uses the registry to store it's settings? :shock:
Isn't there a .svn or .svnconfig file usually???
With regards, Morten.

Edit: Ah sorry, I missed that you are using TortoiseSVN. Anyway: IMHO such a config file can be used, too... however it has to be called and in whatever folder it has to be put into...
Title: Re: Please mark file(s) as svn:eol-style native
Post by: stahta01 on November 22, 2006, 11:52:03 pm
I was lazy and I do use TortoiseSVN, I tried to create an file starting with . and the GUI said no, so I decided to do the registry instead of figuring out how to create a file starting with ".". I assume the command line would have let me do it. But, I was finding examples using different file names. .subversion was one of them.

Tim S
Title: Re: Please mark file(s) as svn:eol-style native
Post by: stahta01 on November 23, 2006, 12:15:57 am
I am still having svn diff issues with the file src/src/wxAUI/manager.cpp.
The cause appears to be because the file contains both unix and dos line endings.

Tim S
Title: Re: Please mark file(s) as svn:eol-style native
Post by: MortenMacFly on November 23, 2006, 08:28:55 am
Quote from: stahta01 on November 23, 2006, 12:15:57 am
I am still having svn diff issues with the file src/src/wxAUI/manager.cpp.
Try again with r3255, please.
Title: Re: Please mark file(s) as svn:eol-style native
Post by: stahta01 on November 23, 2006, 08:38:53 am
Quote from: MortenMacFly on November 23, 2006, 08:28:55 am
Quote from: stahta01 on November 23, 2006, 12:15:57 am
I am still having svn diff issues with the file src/src/wxAUI/manager.cpp.
Try again with r3255, please.

Thanks, with r3255 the error went away.

Tim S