Re: Locking consensus(es) so far

On Oct 14, 2004, at 9:31 AM, Mark Phippard wrote:
>
> The part I disagree with is not marking it conflicted and requiring svn
> resolve. I do not care how difficult that may be for a user to
> understand. You cannot let someone create a conflict and not tell
> anyone.
> That is not helping at all.
>

In the case of hijacked files, VSS doesn't force people to deal with
binary merges. Neither does Clearcase. Why should SVN be so much more
unfriendly? I'm not saying we "don't tell the user", I'm saying, "we
don't force the user through the current binary conflict resolution
process." We scold the user, explain the backup file, and let them
move on. Just like all these other locking VC systems do.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 15:37:46 2004