[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Oskar Enoksson <oskar.enoksson_at_foi.se>
Date: 2004-10-28 09:50:50 CEST

Ben Collins-Sussman wrote:

> 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.

> svn merge file://..../foo file://.../foo .
svn: Attempted to get checksum of a *non*-file node

Doesn't work. But the following works:

>cd ..
>svn merge file://..../foo file://.../foo foo


I think this is a bug in svn.

Oskar Enoksson - mailto:oskar.enoksson@foi.se
FOI - SE-172 90 Stockholm, Sweden
Phone:+46-8-55503000 Fax:+46-8-353481
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 29 01:23:44 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.