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

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.

  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'?

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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 28 15:27:40 2004