[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-09 00:26:19 CET

On Feb 8, 2005, at 4:37 PM, Dale Worley wrote:
> 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.

You've just described enhancement issue #563.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 9 00:29:35 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.