Developer forums (C::B DEVELOPMENT STRICTLY!) > Plugins development
Keybinder v2 notes/problems
oBFusCATed:
I don't know what you've done, but the last commit broke the eol characters in git. They are now the windows style on linux. This is something which must not happen. Can you try to fix it? I suppose the same problem is happening with svn.
Pecan:
--- Quote from: oBFusCATed on April 08, 2020, 01:32:17 am ---I don't know what you've done, but the last commit broke the eol characters in git. They are now the windows style on linux. This is something which must not happen. Can you try to fix it? I suppose the same problem is happening with svn.
--- End quote ---
How do I fix it? I commit from windows. Is windows suppose to have only a linefeed?
Pecan:
--- Quote from: Pecan on April 08, 2020, 08:34:42 am ---
--- Quote from: oBFusCATed on April 08, 2020, 01:32:17 am ---I don't know what you've done, but the last commit broke the eol characters in git. They are now the windows style on linux. This is something which must not happen. Can you try to fix it? I suppose the same problem is happening with svn.
--- End quote ---
How do I fix it? I commit from windows. Is windows suppose to have only a linefeed?
--- End quote ---
On linux, I've run all .h and .cpp thru Dos2Unix.
Should I now just commit those changes from linux?
oBFusCATed:
Not sure. There is property for eol in svn. Probably you should set it first. Read svn docs.
blauzahn:
Having accidentially changed eol happened to us as well. This was in our project with mercurial which is not to blame.
Rather it was my fault. Running Linux, I mounted the Windows partition and committed the changes in the tree lying on the Windows partition I had made before when running Windows. Having experienced that, we avoid now committing when running Linux a source tree which is on an NTFS partition or mounted via Samba.
Now, we have set the appropriate property in the mercurial repo. Maybe, this is enough. Nevertheless, we now always commit on Windows when we have made changes on Windows and on Linux when we have made changes on Linux. Merging back and forth is fine then. This workflow is definitely not elegant but is KISS and works quite reliably.
Dos2Unix does work if the files are on some Linux partition. Of course, you can change files on a windows partition as well with it. But then the OS might interfere when committing and it is probably more error prone, especially if done manually.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version