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

Ben Collins-Sussman wrote:

> Oskar Enoksson wrote:
>
>>
>> > svn merge file://..../foo file://.../foo .
>> svn: Attempted to get checksum of a *non*-file node
>>
>> Doesn't work.
>
>
> This should work if you cd into the foo/ directory.

Ok, but that's what I did, it didn't work, that's why I think it's a bug.

>
> But the following works:
>
>>
>> >cd ..
>> >svn merge file://..../foo file://.../foo foo
>>
>> Works!
>
>
> So you ran this from 'above' the working copy, on the directory named
> 'foo'?

Yes.

>>
>> I think this is a bug in svn.
>
>
>
> It's debatable. If I want to quickly merge a change to one file that
> somebody made, it's really convenient to just type
>
> cd working_copy
> svn merge -r103:104 http://host/repos/foo.c
>
> ...and then have the merge command automatically assume that the
> target is the 'foo.c' in my working copy.

Yes, that should also work. Subversion should be able to figure out if
arguments are a revision number pair and a working-copy object, or two
repository objects.

/Oskar

-- 
Oskar Enoksson - mailto:oskar.enoksson@foi.se
FOI - SE-172 90 Stockholm, Sweden
Phone:+46-8-55503000 Fax:+46-8-353481
http://www.foi.se/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org