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

RE: Conflicting adds aren't handled as a conflict

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-02-08 23:37:14 CET

-----Original Message-----
From: kfogel@newton.ch.collab.net [mailto:kfogel@newton.ch.collab.net]On

"Dale Worley" <dworley@pingtel.com> writes:
> I ran into an odd deficiency of Subversion -- If I've added a file in my
> and in parallel, someone has added and checked in the same file to the
> repository, when I attempt to do "svn update", the update fails, rather
> reporting the situation as a conflict. And this happens even if the
> contents of my WC file are the same at the contents of the repository
> version. (This happens with the command line client, version 1.1.1.)
> is related to bug numbers 899 and 1041.)

Issue #899 (of which #1041 is a duplicate) claims to be fixed in
r4096. It sounds like you're seeing a regression? Can you show us a
precise transcript?

As far as I can tell, it's not a regression. #899/1041 is a complaint that
the situation leaves the WC in a broken state. The fix for it is that "svn
update" fails cleanly. What I am arguing for is that this situation should
not be an error, but rather should be treated similarly to when the file
previously existed and two users simultaneously changed its contents -- "svn
update" should complete, leaving the correct assortment of conflict files so
the user can merge the two files.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 8 23:41:03 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.