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

Re: Copy-on-Update Feature

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-08-31 20:14:06 CEST

Greg Stein <gstein@gmail.com> writes:
> I see it as "I'm trying to edit <this> file" and "that file no longer
> exists (due to move/delete)". That's a conflict in my book.

When a file "moves", I don't consider as no longer existing, I just
consider it existing in a different location. I'd want my edits
preserved, and the same textual conflict behavior we have today.

We're not talking about deletes at all here, only copies (which at the
moment includes renames, although someday if renames are done
differently, I still don't think they should conflict with text mods).


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 31 20:11:17 2007

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