<HTML>
<HEAD>
<TITLE>Problem </TITLE>
</HEAD>
<BODY>
<FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'>Hi list – we are seeing the following error but cant really find anything to explain it?<BR>
<BR>
[trac@server001 ~]$ svk smerge -s //ofbiz/trunk //virtualvillage/ofbiz-trunk -m "daily update from upstream"<BR>
Syncing <a href="http://svn.apache.org/repos/asf/ofbiz/trunk">http://svn.apache.org/repos/asf/ofbiz/trunk</a><BR>
Retrieving log information from 748334 to 748384<BR>
Auto-merging (148, 1373) /ofbiz/trunk to /virtualvillage/ofbiz-trunk (base /ofbiz/trunk:148).<BR>
U LICENSE<BR>
A runtime/tempfiles<BR>
U runtime<BR>
hot-deploy/README.txt - skipped<BR>
.....<BR>
U applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java<BR>
D applications/content/src/org/ofbiz/content/email<BR>
G applications/content/ofbiz-component.xml<BR>
U applications/content/data/MimeTypeData.xml<BR>
applications/content/data/MiscData.xml - skipped<BR>
Name does not refer to a filesystem file: Attempted to get checksum of a *non*-file node<BR>
<BR>
Can anyone help? <BR>
<BR>
Cheers<BR>
Sam<BR>
<BR>
</SPAN></FONT>
</BODY>
</HTML>