Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/03/2006 08:34:45 PM:
> On 10/3/06 8:28 PM, "Mark Phippard" <markp@softlanding.com> wrote:
>
> > 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.
>
> That's confusing; the cmd line used the identical URL and worked. The
only
> difference is in the destination for the merge; Subclipse specified it,
> while I used the implicit default ("." according toe `svn help merge`)
in
> the cmd line invocation. Noticing that, I reverted and tried the merge
again
> in Subclipse, but the merge dialog would not let me override the
> destination. That's why I suspect there's something about my workspace
or
> repository organization which is different, as I presume merging works
for
> others.
I assume when you do it from the command line you are doing it with the
same working copy? Assuming the answer is yes, then I do not see how that
could be the issue.
> > 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.
>
> Understood, but given that the identical revision range and URL were
handed
> to the cmd line and the merge applied properly, this doesn't seem likely
to
> apply to my particular case.
I agree. Try running the command line with your current directory not set
at the right location. Then specify the full path to the target location
on the command. The same path we show in the Console.
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:38:45 2006