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

Re: Overwriting WC files with 'update'

From: Lorenz <lorenznl_at_yahoo.com>
Date: 2005-11-21 09:37:51 CET

kfogel@collab.net wrote:
>Ben Collins-Sussman <sussman@red-bean.com> writes:
>> At the moment, I think the update-editor notices an existing filename
>> which conflicts [...]

what about treating this situation like a merge conflict?

What I mean is: rename the lokal, unversioned file to *.mine and add
the versioned file from the repository. If the files are not
identical, just mark it as conflicted (and insert conflict marks)

Lorenz

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 21 09:41:42 2005

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