here is what I did:

[server]$ cvs up -dPr DRUPAL-6--1
cvs update: Updating .
P README.txt
P relevant_content.info
P relevant_content.module
cvs update: Updating relevant_content_cck
U relevant_content_cck/relevant_content_cck.info
U relevant_content_cck/relevant_content_cck.install
RCS file: /cvs/drupal-contrib/contributions/modules/relevant_content/relevant_content_cck/Attic/relevant_conte          nt_cck.module,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
Merging differences between 1.1.4.3 and 1.1.4.4 into relevant_content_cck.module
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in relevant_content_cck/relevant_content_cck.module
C relevant_content_cck/relevant_content_cck.module
cvs update: Updating relevant_content_cck/theme
U relevant_content_cck/theme/content-field-relevant-content.tpl.php
U relevant_content_cck/theme/relevant_content_cck.theme.inc

here is what I got after the update:

Parse error: syntax error, unexpected T_SL in /..../relevant_content/relevant_content_cck/relevant_content_cck.module on line 258

after deleting the module and cvs checking it out it seems to work fine, so just a head up.. maybe the merge isnt working properly! Sorry I didnt poke around to get a look at line 258 as I wanted to fix my live site asap..

Cheers

Comments

nicholasthompson’s picture

nicholasthompson
Primary language English
commented
Status: Active » Closed (won't fix)

Looks like this was caused by your working copy of relevant_content_cck.module was modified. This meant CVS tried to merge my changes with yours which caused some invalid PHP. This is common when you have locally modified copies.

dakku’s picture

dakku commented

yes I remember now! We hacked it a little to get the themeing working, I had posted a patch (http://drupal.org/node/500786), which has been committed to the latest dev :)

Thanks