From: Egon W. <eg...@sc...> - 2002-07-22 12:51:22
|
On Monday 22 July 2002 12:35, Dr P. Murray-Rust wrote: > Greetings all - for various reasons I haven't been very active on SELFML. > > I recently updated on CVS and the build.xml appears to be a build.xml,v > file - it seems to have diffs in it and isn't WF XML. Is this a windows > problem? or do I have to reset something? It contains stuff like: build.xml,v is the actual file name on the CVS server. The diff part is often caused when cvs is not able to merge changes in a file... I have this now and then when I changed a file locally in such a way that cvs is no longer sure on how to apply a patch from the cvs server... It is not a windows problem, anyway... > <!-- > <!-- <DEFANGED_STYLE > in="${build}/propertyType/propertyTypeList.xml" > out="${build}/build_propertyType.xml" > <<<<<<< build.xml > style="${build}/xsl/build_propertyType.xsl"/> > --> > <!-- <DEFANGED_STYLE > in="${build}/propertyType/propertyTypeList.xml" > out="${build}/build_propertyType.xml" > style="${build}/xsl/build_propertyType.xsl"/> > ======= > style="${build}/xsl/build_propertyType.xsl"> > <outputproperty name="method" value="xml"/> > --> </DEFANGED_STYLE> > > >>>>>>> 1.13 What I do then is delete the file locally, and do a new "cvs update"... Egon |