[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: <kfogel_at_collab.net>
Date: 2005-02-08 23:18:51 CET

"Dale Worley" <dworley@pingtel.com> writes:
> I ran into an odd deficiency of Subversion -- If I've added a file in my WC,
> 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 than
> 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.) (This
> 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?

Thanks for doing the issue search, by the way, that helped a lot.

Whether there should be a conflict even if the contents are the same
is a matter of opinion. Certainly it wouldn't be wrong to get a
conflict, though it might be friendlier to just silently do a no-op
merge. But what really concerns me is that you're not even getting a


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:33:43 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.