[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: John Peacock <jpeacock_at_rowman.com>
Date: 2007-06-08 15:22:43 CEST

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.

Have you tried SVK's conflict handling, to see how they are handling it?
  Any time a merge causes a conflict, the commandline client gives you a
prompt that consists of the possible choices:

Conflict found in config/dnsbl_zones:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e]

where the "m)erge" choice will call available external merge resolution
tools (e.g. MELD, kdiff3, or even vim). This behavior is on by default
for the commandline, unlike what you are proposing; the prompt could
certainly be suppressed with a --non-interactive option.

Just something to consider, since I use this all the time and it really
does what I would expect Subversion to support...


John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 8 15:22:35 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.