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

Re: conflict callback API

From: Nik Clayton <nik_at_ngo.org.uk>
Date: 2007-07-02 12:56:41 CEST

Justin Erenkrantz wrote:
> On 6/27/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
>> I've just committed (in r25557) a first draft of the API I'd like to
>> use for interactive conflict callbacks. Please take a look at the new
>> 'conflicts' section of svn_client.h
>>
>> Here's the back-of-napkin logic for how I think 'svn up', 'svn
>> switch', and 'svn merge' should behave:
>
> Do we plan to implement a conflict callback in the svn command-line
> client? I don't know if you've played with mergemaster from FreeBSD,
> but it's interactive merge resolution UI is sweet for a command-line
> tool. (I haven't dug into seeing how it's implemented - it may be
> just offloading the resolution to some other tool I don't see
> directly.) -- justin

It uses sdiff(1), which displays two column diff data, and allows the
user to choose the left or the right hand hunk, and/or edit either of
the hunks prior to selecting them for merge.

Code is here:
http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/mergemaster/mergemaster.sh

sdiff(1) at http://www.freebsd.org/cgi/man.cgi?sdiff.

N

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 2 15:16:19 2007

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