Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

Patches to compile and link C::B against wxWidgets 2.8.0

<< < (13/25) > >>

Game_Ender:
Have you tried setting svn:eol-style property to native?  You should really have your SVN client set to automatically set that property (along with the mime type) on every file you add.  When the property is set, subversion will make sure the eol style markers are just right.

Offtopic:
Many helpful little SVN tidbits are buried in that book.  Code::Blocks would probably be helped by using the vendor branches.  Which would allow us to easily maintain custom versions of projects we depend on.

stahta01:

--- Quote from: Game_Ender on December 19, 2006, 11:01:34 pm ---Have you tried setting svn:eol-style property to native?  You should really have your SVN client set to automatically set that property (along with the mime type) on every file you add.  When the property is set, subversion will make sure the eol style markers are just right.

Offtopic:
Many helpful little SVN tidbits are baried in that book.  Code::Blocks would probably be helped by using the vendor branches.  Which would allow us to easily maintain custom versions of projects we depend on.

--- End quote ---

That types of things only help if the file has only one type of line endings this file has Mac and Native endings. I can fix only if I have write access. Tim S

Edit: I know how to fix this in CVS when I have write access, but since it is SVN and no write access. I can only fix the file each time myself. This means each time the file is edited I have to do manual work on the diff/patch file.

Note: I do agree svn:eol-style property to native is the correct thing to do, but I can NOT do it on the server. I can only do it on my machine which does NOT fix the issue of the server copy being damaged because svn:eol-style property was not set to native when someone edited in an old Mac setup.

Game_Ender:
Just did a little research, its odd that it fails on mixed line endings.  Probably a pretection to keep you from setting it for binary files.

Pecan:

--- Quote from: stahta01 on December 19, 2006, 10:59:52 pm ---I edited the source you liked to in order to make an dos2mac command

I then ran the below commands and it looks to fix the problem.

dos2mac *.cpp
mac2unix *.cpp
unix2dos *.cpp

svn propset eol-style native *.cpp

Tim S

Uploaded the changed source to http://www.savefile.com/projects/1039215
pick DOS2UNIX.zip


--- End quote ---

where do you put
--- Code: ---svn propset eol-style native *.cpp
--- End code ---

stahta01:

--- Quote from: Game_Ender on December 19, 2006, 11:13:15 pm ---Just did a little research, its odd that it fails on mixed line endings.  Probably a pretection to keep you from setting it for binary files.

--- End quote ---

SVN diff works it just produces garbage that I have to hand edit each time.
This is with this command.
svn.exe diff --extensions --unified=1 --extensions --ignore-eol-style > filename-unix.patch

The following command what's to remove nearly all the lines and then readd them with new line endings
svn.exe diff > filename-unix2.patch

Tim S

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version