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

Re: svn_wc_conflict_result_choose_repos found dangerous?

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-18 14:11:14 CEST

On 7/18/07, Erik Huelsmann <ehuels@gmail.com> wrote:

> Aren't they just 2 different use-cases ('select-theirs-entirely' or
> 'select-theirs-hunk-wise')?

I don't know of any VC system that offers both of these options. I've
only seen users concerned about resolving conflicted hunks; I can't
imagine a situation where the user would want to resolve conflicted
hunks *and* toss out other local edits at the same time.

On 7/18/07, David Glasser <glasser@mit.edu> wrote:

> Well, we don't necessarily need to do any file scanning: can't we just
> rerun the diff3 algorithm in a mode that chooses one side or the
> other? (Possibly by extending our diff3 API...)

Ah, good point, I'll check into this. (Though, in the case of an
external diff3 tool, this may not be an option, so we might end up
having to scan for conflict markers anyway.)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 18 14:10:29 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.