2008-07-15, 22:57
Somehow or other, opening up the solution with VC2008EE screwed up my SVN copy. I got some popup about line endings when I did it and I thought I told it to leave them alone.
Now when I sync I get an error in Tortoise about inconsistent line endings and it just bombs out and fails. Of course its on a file that I have local modifications which are not synced into the SVN yet. Does anyone know how to fix this?
Should they be DOS (CRLF) or Unix (CLF) line endings? If my linux box hadn't died a week ago, I'd just open a file up in vi to see, but I'm restricted to Windows only at the moment.
(If anyone is curious, the OS drive fried. The BIOS doesn't even see it. I gotta rebuild on a new drive but I'm a little lazy. Thankfully I keep my data separate and those drives are all ok.)
** edit **
Notepad++ will show line endings! And the file actually had inconsistent line endings. Some lines ended CRLF, some where LF. Very strange. I had to use Notepad++ to force them all into "Windows" format, as it calls it.
But I'm still getting the problem syncing. It seems its in the SVN now though as its the VideoInfoScanner.h.svn-base file. I think Tortoise is trying to be smart and telling me the line endings are mangled, but it stupidly bombs out the entire process.
Now when I sync I get an error in Tortoise about inconsistent line endings and it just bombs out and fails. Of course its on a file that I have local modifications which are not synced into the SVN yet. Does anyone know how to fix this?
Should they be DOS (CRLF) or Unix (CLF) line endings? If my linux box hadn't died a week ago, I'd just open a file up in vi to see, but I'm restricted to Windows only at the moment.
(If anyone is curious, the OS drive fried. The BIOS doesn't even see it. I gotta rebuild on a new drive but I'm a little lazy. Thankfully I keep my data separate and those drives are all ok.)
** edit **
Notepad++ will show line endings! And the file actually had inconsistent line endings. Some lines ended CRLF, some where LF. Very strange. I had to use Notepad++ to force them all into "Windows" format, as it calls it.
But I'm still getting the problem syncing. It seems its in the SVN now though as its the VideoInfoScanner.h.svn-base file. I think Tortoise is trying to be smart and telling me the line endings are mangled, but it stupidly bombs out the entire process.