[Exist-development] Porting changes from trunk to stable/2.0.x

[Joe W. <jo...@gm...>]

Hi all,

I've been trying to merge Andrzej's ant work in trunk to 2.0.x.  I am using
Wolfgang's suggested technique, which worked for me in the past but which
isn't working for me now.  Here was his technique:

> let's say you want to copy revision 10 from trunk to 1.4.x, assuming
> that you are currently in the 1.4.x directory:
>
> svn merge -r 9:10
https://exist.svn.sourceforge.net/svnroot/exist/trunk/eXist .

Here is what I did this time to merge Andrzej's revision 15960 into 2.0.x.
 On my Mac, in the terminal, inside the 2.0.x directory, I typed this
command:

  $ svn merge -r 15959:15960
https://exist.svn.sourceforge.net/svnroot/exist/trunk/eXist .

The response:

  svn: '
https://jo...@ex.../svnroot/exist/stable/eXist-2.0.x'
isn't in the same repository as '
https://exist.svn.sourceforge.net/svnroot/exist'

Does anyone have any tips for me to successfully perform the merge?

Thanks,
Joe