[Genome] Local Customer Tracks make alpha failed again

[B. Liu]

Dear All,

I have problem again!

When I run make alpha ZOO_DBS="" DBS=hg18

I got the following message:

find . -type l -exec rm {} \;
cvs -q up -d -P .
? human/hg17/trackDb.local-hg17-bed.ra
? human/hg18/CUFusedCOSMIC.html
? human/hg18/CUSjoblomAllMutations.html
? human/hg18/CUSjoblomCANGenes.html
? human/hg18/trackDb.local-hg18-bed.ra
? human/hg18/trackDb.local-hg18-wiggle.ra
M human/hg17/trackDb.ra
C human/hg18/trackDb.ra
make: *** [alpha] Error 1

I think it is the CVS conflicts, but I can't find <<<<<<, =====, and 
>>>>>> separators in the makefile this time.

Help please.

Thanks

Bin


---------- Forwarded message ----------
Date: Thu, 16 Mar 2006 08:30:12 -0800 (PST)
From: Rachel Harte <hartera at soe.ucsc.edu>
To: B. Liu <bl246 at hermes.cam.ac.uk>
Cc: genome at soe.ucsc.edu
Subject: Re: [Genome] Local Customer Tracks Description HTML file

Bin,
One of our engineers pointed out that missing separator problems in makefiles 
can sometimes be caused by CVS conflicts when updating CVS. If CVS can't tell 
how to merge updates with local changes, it puts both changes in the file with 
<<<<<<, =====, and >>>>>> separators
which confuse make. So take a look at your makefile and see if you have this 
kind of problem. If so, you will need to manually merge the changes. I hope 
that this helps you. Please let us know if you have further questions.

Rachel