Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/03/2006 08:18:38 PM:
> Running Eclipse 3.2.1, Subclipse 1.1.7, javaHL 1.3.1 on OS/X, I
attempted to
> merge a branch into trunk, but it fails, the console yielding:
>
> merge -r9941:HEAD svn+ssh://svn.rmgapps.
> com/export/svnroot/appdev/Core/branches/aslack/hashedFilters
> /Users/jay/rmg/appdev/Core Invalid filesystem path syntax svn: Cannot
> replace a directory from within
>
> A comparable though not identical merge via the command line works,
however:
>
> % svn merge -r9941:HEAD svn+ssh://svn.rmgapps.
> com/export/svnroot/appdev/Core/branches/aslack/hashedFilters
>
> Presumably there?s something about my workspace setup which is confusing
> Subclipse. What might that be?
It wouldn't be Subclipse that is confused. We are just taking your inputs
and running the Subversion API. The output and errors comes out of the
API.
This particular error means you did not specify the correct URL based on
the local resource you selected. Try going up or down a segment in your
URL.
A second cause of this problem can be that your revision range is
including the revision when the branch was created. In other words, if
your branch was created in r9942. In Subclipse, if you use the Select
Revision dialog, you should be able to select the range or contiguous
range of specific revisions that you want to merge and we will fill in the
correct from and to URL. If you do this, you would not select the
revision where the branch is created since you do not want to merge that
revision.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 4 02:28:29 2006