[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: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2005-11-21 11:44:13 CET

On Mon, 21 Nov 2005, Giovanni Bajo wrote:

> Peter N. Lundblad <peter@famlundblad.se> wrote:
>
> > (An alternative would be to just install the new text-base, which will
> > make svn treat the pre-existing file as a modified version of the new
> > file. But might this be too dangerous? It wouldn't loose data, but
> > maybe it is confusing.)
>
>
> IIUC, it'd be very dangerous. The user might accidentally commit it (a common
> scenario would be that the pre-existing file is not the latest version of the
> file that was actually added to the repository, but it comes from an older
> iteration of the patch). Marking it as a conflict makes sure the user at least
> explicitally resolves it one way or another.
>
You are unbelievably correct:-) Now you know how my brain works early in
the morning. Conflict it is.

Regards,
//Peter

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

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