Difference in behavior 1.4.3 to 1.5.x resulting in "Cannot replace a directory from within"

[Ben Lavender <bl...@gmail.com>]

Hi all,

Apologies if this has been covered before, but I couldn't get google
to come up with an exact answer.

I have a problem with a merge.  The setup is:

/trunk/widgets/x/x.module
/vendor/widgets/1.x/x.module
/vendor/widgets/2.x/x.module

The history is something like this:
svn add vendor/widgets/1.x (exploded tarball)
svn copy vendor/widgets/1.x/ trunk/widgets/x

Working copy of widget 1.x.  All's well.

Widget x is updated by the vendor, so:
svn copy vendor/widgets/1.x vendor/widgets/2.x
cd vendor/widgets/2.x ; cvs up
(appropriate svn del's)
svn ci

This gets us a changeset which contains, in one changeset:
A copy from 1.x to 2.x
Updates from 1.x to 2.x

That changeset is 6235.

Now, I go and try to update trunk:
cd trunk/widgets/x
svn merge -c 6235 http://svn/vendor/widgets/2.x .

I receive the error:
Cannot replace a directory from within

I get the same error with svn merge -c 6235 ../../vendor/widgets/2.x .
from within trunk.

After much consternation with the original developer, we discover:
He can do the merge with local working copies or the server, no problems.
I cannot do the merge with either a working copy or the server with
the same error.

We're stumped here.  It's the same repo from the same server:  the
only thing different are our CLI versions.  I'm using 1.5.3 packaged
with CentOS 5 (I also tried 1.5.0), he's using 1.4.3 from MacPorts on
OS X.

I've done a completely new checkout and the behavior is repeatable at
the old version numbers.  I can do merges fine on this box, but this
is the first time, to my knowledge, I've tried to merge a changeset
with a copy and the updates in the same changeset.

Is this a known behavior change from 1.4.3 to 1.5?  Is this a bug?  A feature?

Thanks,
Ben Lavender

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org