Re: Bug with directory containing file with the same name as the directory

Oskar Enoksson wrote:

> cd foo
> svn merge file:///extra/svn-test/releases/foo file:///extra/svn-test/foo
>

I think this is that one special case where the merge command is trying
to be "extra friendly" and guess at what you want. In particular, when
the (1) basenames of the two URLs are identical, and (2) no explicit
target is given, iand (3) the working copy has something with the same
name, then it tries to apply the diff to that one object.

So in this case, the merge command is behaving as if you had typed 'foo'
as the explicit target to receive the merge:

   svn merge file://..../foo file://.../foo foo

... and so you're seeing an error about trying to apply the difference
between two directories to a file.

I think the workaround is to give an explicit target. Use "." as the
3rd argument to the merge command.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 28 04:07:41 2004