[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: Greg Stein <gstein_at_gmail.com>
Date: 2007-08-31 01:22:49 CEST

You might be editing the file in the original location for a specific
reason. Having it suddenly and quietly move could be bad. Deleting/
moving is not "just another edit to merge."

On Aug 30, 2007, at 4:09 PM, "Mark Phippard" <markphip@gmail.com> wrote:

> On 8/30/07, Greg Stein <gstein@gmail.com> wrote:
>> IMO, mark the file as a conflict, leaving behind the appropriate bits
>> for the user to see the original and their edits. The user then has
>> to
>> explicitly recognize the problem and run 'svn resolved'
>
> Why mark the file as conflicts if you can do better? IMO, in the case
> of update, it would work about the same as it would if the file did
> not move. If it could contextually merge the incoming changes it
> will, if not it will product a conflict.
>
> The difference here is that today we do neither. Your local edits
> become unversioned and the new files comes in as the normal state.
>
> Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 31 01:23:05 2007

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