[mythtv] svn 10604 => compile error
Nigel Pearson
nigel at ind.tansu.com.au
Thu Jul 20 23:39:31 UTC 2006
> dvbchannel.cpp:660: error: parse error before `<<' token
...
> dvbchannel.cpp:668: error: parse error before `>>' token
...
> dvbchannel.cpp:688: error: syntax error before `<<' token
...
> dvbchannel.cpp:704: error: syntax error before `<<' token
...
> dvbchannel.cpp:722: error: syntax error before `<<' token
...
>
...
> dvbchannel.cpp:729: error: syntax error before `<<' token
That looks like "svn update" was unable to merge that file.
Have a look at it in an editor, you will probably see stuff like:
<<<<< mine
{
int i;
>>>>> r10585
{
unsigned int i;
=====
that means you had local patches to the file that clash
with recent changes in SVN.
--
Nigel Pearson, nigel at ind.tansu.com.au|"Look at this!
Telstra Net. Eng., Sydney, Australia | Do you think I put this in
Office:9202 3900 Fax: 9261 3912 | to get better reception?"
Mobile: 0408 664435 Home: 9792 6998 | Batty - Fern Gully
More information about the mythtv-dev
mailing list