[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: David Glasser <glasser_at_mit.edu>
Date: 2007-07-18 14:04:52 CEST

On 7/18/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> I agree 100%. In the case where the 'merged' file doesn't exist (i.e.
> binary files), selecting mine/theirs would choose the entire file.
> But if a 'merged' file does exist, we need to scan the file, detect
> conflict markers, and select one side of the hunk.

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...)

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
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:04:20 2007

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