Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
Message to oBFusCATed or other CB Devs about patches to CB Projects.
stahta01:
I have added the prefix of "- " to commit message.
Note: I have no idea if you should or can fix the fact of Git treating "src/sdk/resources/lexers/lexer_bibtex.sample" as Binary from my viewpoint or whether it is just a problem on my end.
I think "src/sdk/resources/lexers/lexer_bibtex.sample" was saved with CRLF in it and that is causing the problem.
Tim S.
oBFusCATed:
In svn...
I don't know what is going on with the lexer_bibtex.sample...
stahta01:
--- Quote from: oBFusCATed on October 25, 2014, 01:25:08 am ---In svn...
I don't know what is going on with the lexer_bibtex.sample...
--- End quote ---
I think this command needs ran on it.
My Git and Svn are set up slightly weird so I get more line ending issues.
I ran this command to create the patch below.
--- Code: ---svn propset svn:eol-style native src/sdk/resources/lexers/lexer_bibtex.sample
--- End code ---
--- Code: ---Index: src/sdk/resources/lexers/lexer_bibtex.sample
===================================================================
--- src/sdk/resources/lexers/lexer_bibtex.sample (revision 10009)
+++ src/sdk/resources/lexers/lexer_bibtex.sample (working copy)
Property changes on: src/sdk/resources/lexers/lexer_bibtex.sample
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- End code ---
oBFusCATed:
Probably someone with svn checkout should do it, I don't want to test this part of git-svn...
stahta01:
--- Quote from: oBFusCATed on October 26, 2014, 02:50:05 am ---Probably someone with svn checkout should do it, I don't want to test this part of git-svn...
--- End quote ---
Sounds correct, I have no idea that git-svn did this even.
But, I thought you had svn checkout, also.
But, I can understand using only one of them. I am still learning Git; I almost feel like I have learned as much about Git as a know about Svn.
FYI:
I found three files in my local Git repo with mixed line ending.
The do NOT seem to have mixed line ending in SVN.
Here the three files; no idea if it is just my local repo with mixed line ending or it is your repo that has the mixed line endings.
--- Code: ---src/sdk/scripting/bindings/scriptbindings.cpp
src/sdk/filemanager.cpp
src/plugins/scriptedwizard/compilerpanel.cpp
--- End code ---
Thank you again for applying by last 6 commits; I am working some more.
Decided to wait a few days to before asking you to test and apply them.
Tim S.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version