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

Re: Problems with property conflict callback

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-29 21:37:20 CET

On 10/29/07, Stefan Küng <tortoisesvn@gmail.com> wrote:

> FWIW, I only test with merge too. Because for updates, I just let the
> conflict happen.
> Imagine someone doing a lengthy update, goes for a coffee until the
> update is finished. He returns, and finds that the update was stalled
> due to the conflict callback asking for user input.
> For the user, it doesn't make much of a difference whether he has to
> resolve the conflicts at the end of the update or in between - the
> conflicts are the same.
> Only for merges it's important to resolve the conflicts right away,
> because otherwise further merges could fail.

Is this a configurable thing? I'd like to always be prompted during an update.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 29 21:41:35 2007

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