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

Re: RFC: interactive conflict resoution callback

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-06-08 19:58:52 CEST

On Thu, 07 Jun 2007, Ben Collins-Sussman wrote:

> One of the next things on my plate is to give users the option to
> resolve conflicts interactively. That is, rather than
> update/switch/merge just marking files as 'conflicted' and then
> letting the user deal with the conflicts later on, the whole process
> can optionally pause on a conflict and have the user interactively
> resolve the problem on the spot.

The (evolving) func spec for this can be found here:

http://subversion.tigris.org/merge-tracking/func-spec.html#conflict-resolution
 
> I imagine that this interactivity would *not* be turned on by default,
> but by passing an argument like --accept={mine,theirs,...}... as in
> Jeremy's other patch ... that would be implemented as an extremely
> simple instance of the conflict-resolution callback. A more complex
> instance of the callback would actually prompt the user the way
> perforce does ("Do you want to use your version, their version, or the
> merged version?"). Furthermore, I imagine a new runtime config option
> could allow any arbitrary script or (GUI) program to do interactive
> resolution.
>
> My intuition is that the conflict-resolution callback interface would
> take file pointers as arguments -- pointers to our standard fulltext
> conflict files (including a merged working file that may contain
> conflict markers). The callback would return some specific enumerated
> value, much like Jeremy's svn_accept_t. The return values would be
> "use mine", "use theirs", "use the merged working file", and so on.
>
> Any thoughts/objections to my plan? Things I've forgotten?

What did you think about the previous threads on this topic?:

http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=121756
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=121263

  • application/pgp-signature attachment: stored
Received on Fri Jun 8 19:59:03 2007

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