Re: [Geotools-devel] Help with svn merge

2006-10-16 Thread Richard Gould
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/ a

Re: [Geotools-devel] Help with svn merge

2006-10-16 Thread [EMAIL PROTECTED]
David Adler ha scritto: > 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 > in my 2.3.x source tree and got the messages > I usually do it piecemeal, instead of doing it with svn me

[Geotools-devel] Help with svn merge

2006-10-16 Thread David Adler
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 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