David Adler wrote: > I'm trying to apply the DB2 changes I made to 2.2.x to 2.3.x and trunk. > > I tried the command: > svn merge -r 21897:21898 http://svn.geotools.org/branches/2.2.x >
That should be: svn merge -r 21897:21898 http://svn.geotools.org/geotools/branches/2.2.x . (in your 2.3.x/ and trunk/gt/ directories) > in my 2.3.x source tree and got the messages > > svn: REPORT request failed on '/!svn/vcc/default' > svn: > Cannot replace a directory from within > > I've never done a 'merge' before so maybe it is just user error. > > I have a feeling it is not a good idea just to copy my 2.2.x versions over > the 2.3.x versions in my source tree and check them in. > > > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job easier > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Geotools-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/geotools-devel > ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Geotools-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
