bug? svn add commited by another breaks working copy?

[Paul Querna <ch...@force-elite.com>]

Hello All,

I had some patches that I summited to Lucene4c committed, and one of
them added a new file.  Since I had done a 'svn add file' in my working
copy, to make the patches easier to generate, I expected that once they
were committed, I could just 'svn update'.  Instead I get:

svn: Failed to add file 'foo2/blah': object of the same name already exists

$ svn --version

svn, version 1.3.0 (dev build)
   compiled May 25 2005, 09:53:47

Recipe:

REPO=/tmp/svntest
svnadmin create ${REPO}

svn co file://localhost/${REPO} foo1
svn co file://localhost/${REPO} foo2
touch foo1/blah foo2/blah
svn add foo1/blah
svn add foo2/blah
svn commit foo1 -m ""
svn update foo2

I looked quickly in the issue database, but I didn't see anything like this.

-Paul

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

Re: bug? svn add commited by another breaks working copy?

[Ben Collins-Sussman <su...@collab.net>]

Paul Querna wrote:

> I looked quickly in the issue database, but I didn't see anything like this.

The server is trying to send changes to the working copy, and there's an 
unversioned file in the way.  The problem is that update just isn't 
smart enough to realize that the blocking-file just happens to be 
identical to the one it's trying to add from the server.

In the case of file edits, 'svn update' notices that local edits just 
happen to match the incoming edits from the server, and assumes that the 
"patch is already applied" and silently merges.  But when 'svn update' 
receives a tree-structure change (such as an add), it's not yet smart 
enough to notice that a silent merge is possible.

This issue is definitely filed already, it's issue 563, as old as the hills:

   http://subversion.tigris.org/issues/show_bug.cgi?id=563

Wanna fix it?  :-)

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