chris (christowang) wrote in lj_dev,
chris
christowang
lj_dev

Bad Lines in files from CVS

I have been having problems with a lot of the site working on my goathack account, and it seems like there are extra lines being inserted from CVS.

For instance, in cvs/livejournal/htdocs/update.bml I found these lines:
<<<<<<< update.bml
$res{'message'} = LJ::eall($res{'message'});
<<<<<<< update.bml
$res{'message'} =~ s!("|')?(http://[a-z0-9A-Z_\-\.\/\?\%\+\=\&\:\;]+)!$1 ? "$1$2" : "$2"!eg;
=======
$res{'message'} =~ s!("|')?(https?://\S+[a-zA-Z0-9_/&=\-])!$1 ? $& : "$2"!eg;

>>>>>>> 1.38
$message = "$ML{'.servermsg'}
  • $res{'message'}
";
=======


I found another one in talkpost.bml. Not sure if I'm doing something wrong, problem with cvsreport.pl, or what the deal is but any help is appreciated.
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 4 comments