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

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-01 06:06:54 CEST

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:


Wanna fix it? :-)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 1 06:07:36 2005

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

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