Mixed platforms and CVS

Beatnik on 2006-02-10T08:51:50

I did it again. I fscked up my repository. At some point, I edited some source file on my Windows box, scp'ed it to my regular linux dev box and commited. Now I'm stuck with a CVS entry that 100% different from the last entry. I won't even consider editing the CVS repository manually and remove all the ^M characters manually.. Damn you, newline characters!


And that's why..

jk2addict on 2006-02-10T15:11:47

we have Subversion now a days. :-)

Re:And that's why..

Beatnik on 2006-02-10T15:37:27

I have plans on migrating to Subversion and I even bought a Subversion book.. but I plan on migrating when I have a more or less stable release (in other words, when I have less bug fixing worries on my mind). I noticed the fscked up commit too late so I already commited a newer entry.. I already fscked up my repo once so I'll just live with it :) I'll move to Subversion anyway :)

Go on and edit the CVS repository

duff on 2006-02-10T15:26:15

Editting the CVS repository isn't so bad, I've had to do it a couple of times myself in the distant past. These days though, it pays to just use subversion. http://subversion.tigris.org/ (in case you want to give it a try. and don't forget to read the book http://svnbook.red-bean.com/)

Ultraedit

Alias on 2006-02-10T15:31:57

If it's a Perl file, ultraedit fortunately does "that looks like Unix, I'll keep it as Unix", so you can scp back and forth sanely.

Alas, Dreamweaver does NOT.

Guess what type of files I generally find myself 100%ing :(

Re:Ultraedit

Beatnik on 2006-02-10T15:39:07

Normally, when I edit on Windows, I just scp to my linux box and do a manual diff, updating the code in my original files by hand (usually it's just a few lines). I didn't this time.. That'll teach me to commit at 2 AM :)