Stories
Slash Boxes
Comments
NOTE: use Perl; is on undef hiatus. You can read content, but you can't post it. More info will be forthcoming forthcomingly.

All the Perl that's Practical to Extract and Report

use Perl Log In

Log In

[ Create a new account ]

Beatnik (493)

Beatnik
  (email not shown publicly)
http://www.ldl48.org/

A 29 year old belgian who likes Mountain Dew, Girl Scout Cookies, Tim Hortons French Vanilla Flavoured Cappucinno, Belgian beer, Belgian chocolate, Belgian women, Magners Cider, chocolate chipped cookies and Perl. Likes snowboarding, snorkling, sailing and silence. Bach can really cheer him up! He still misses his dog.

Project Daddy of Spine [sf.net], a mod_perl based CMS.

In his superhero time (8.30 AM to 5.30 PM), he works on world peace.

Journal of Beatnik (493)

Friday February 10, 2006
03:51 AM

Mixed platforms and CVS

[ #28644 ]
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!
The Fine Print: The following comments are owned by whoever posted them. We are not responsible for them in any way.
 Full
 Abbreviated
 Hidden
More | Login | Reply
Loading... please wait.
  • we have Subversion now a days. :-)
    • 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 :)
  • 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/ [tigris.org] (in case you want to give it a try. and don't forget to read the book http://svnbook.red-bean.com/ [red-bean.com])
  • 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 :(
    • 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 :)