Re: [Subclipse-users] "Cannot replace directory from within"error while merging

Jay Sachs <jay.sachs@riskmetrics.com> wrote on 10/04/2006 10:34:50 AM:

> No, it did not. 9942 was the revision that saw the creation of the
branch.
> There were several more commits on trunk, one commit to the branch, and
then
> several more to trunk before I attempted the merge.

I touched on this before. From everything I know about Subversion (which
is actually quite a lot) if you created the branch in r9942 then when you
are merging, you should not be including that revision in the merge (you
are specifying 9941). If you do, then the merge tries to create the root
folder in your WC which leads to that error message. I would specify
r9942 as the From revision on the merge, which would mean the changes in
that revision would not be considered. Or try my suggestion of using the
Select Revision option and selecting the range of revisions that contain
the changes you want to merge.

Although I again come back to being stumped by why the command line seems
to be handling it for you.

Nonetheless, if you search the mailing lists you will find a lot of people
that get this error and the root causes are usually the same one or two
things:

http://www.google.com/custom?domains=svn.haxx.se&q=Cannot+replace+directory+from+within

> The one thing that might be different is our repository layout has the
form
>
>
> In other words, we inverted "trunk/tags/branches" and projects in the
> filesystem hierarchy. But I don't really see how that would affect
anything,
> they're all just paths.

I agree with you here. I do not believe this would matter.

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 16:55:44 2006