Re: [Geotools-devel] Help on svn merge.

2006-10-18 Thread Martin Desruisseaux
Adrian Custer a écrit : > The two ? I know about. However, all the reformatted and autogenerated > code I don't. Is there a way to exclude this? Have I broken the pom.xml > configures or my svn properties? I modified the maven/build-configs/.../jalopy.settings file yesterday (pushed the line leng

[Geotools-devel] Help on svn merge.

2006-10-18 Thread Adrian Custer
Hey all, I've only modified pom files and then done lots of mvn clean install but when I do an svn st now, I get: logipod:/soft/SVN/geotools/trunk/gt> svn st ? maven-v4_0_0.xsd M demo/mappane/pom.xml M demo/introduction/pom.xml M demo/property/pom.xml M demo/data/pom.x