Not sure what to be done; maybe I can commit to a branch for you? Or create the diff in eclipse - oh but you don't use Eclipse :-(
Okay a temporary branch it is - try the following: - http://svn.osgeo.org/geotools/branches/map-context I don't really want to switch onto this branch if I can help it but it is there for evaluation. Cheers, Jody On 11/06/2010, at 1:41 PM, Michael Bedward wrote: > Hi Jody, > > Still having problems applying the new patch to my local trunk sources > (see below). I'm heading out for a sunny lunchtime run now (luxury !) > but will try hand-editing the patch rejects when I get back. > > Michael > > > guanaco:clean-trunk michael$ patch -p0 < geot-3136-mapcontext.patch > patching file > modules/library/render/src/test/java/org/geotools/renderer/lite/RendererBaseTest.java > Hunk #1 FAILED at 33. > 1 out of 4 hunks FAILED -- saving rejects to file > modules/library/render/src/test/java/org/geotools/renderer/lite/RendererBaseTest.java.rej > patching file > modules/library/render/src/test/java/org/geotools/renderer/lite/LabelingTest.java > patching file > modules/library/render/src/main/java/org/geotools/map/DefaultMapLayer.java > Hunk #2 FAILED at 46. > 1 out of 2 hunks FAILED -- saving rejects to file > modules/library/render/src/main/java/org/geotools/map/DefaultMapLayer.java.rej > patching file > modules/library/render/src/main/java/org/geotools/map/GridReaderLayer.java > patching file > modules/library/render/src/main/java/org/geotools/map/DirectLayer.java > patching file > modules/library/render/src/main/java/org/geotools/map/FeatureLayer.java > patching file modules/library/render/src/main/java/org/geotools/map/Layer.java > patching file modules/library/render/src/main/java/org/geotools/map/Map.java > patching file > modules/library/render/src/main/java/org/geotools/map/GridCoverageLayer.java > patching file modules/library/xml/src/test/java/org/geotools/GMLTest.java > patching file > modules/unsupported/shapefile-renderer/src/test/java/org/geotools/renderer/shape/TestUtilites.java > Hunk #2 succeeded at 68 with fuzz 1. > patching file > modules/unsupported/shapefile-renderer/src/test/java/org/geotools/renderer/shape/Rendering2DTest.java > patching file > modules/unsupported/shapefile-renderer/src/test/java/org/geotools/renderer/shape/ShapeRendererTest.java > patching file > modules/unsupported/shapefile-renderer/src/test/java/org/geotools/renderer/shape/LabelingTest.java > patching file > modules/unsupported/shapefile-renderer/src/main/java/org/geotools/renderer/shape/ShapefileRenderer.java > patching file > modules/extension/wms/src/main/java/org/geotools/map/WMSMapLayer.java > guanaco:clean-trunk michael$ ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Geotools-devel mailing list Geotools-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geotools-devel
