[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: Mark Phippard <markphip_at_gmail.com>
Date: 2007-06-09 04:51:09 CEST

On 6/8/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 6/8/07, Mark Phippard <markphip@gmail.com> wrote:
> > If you do not think hunk-based has value, and I do not think
> > file-based has value, maybe that is a sign that we do not need the
> > feature. Once Jeremy's patch is in someone can get your feature
> > pretty easily by running svn resolved after the merge.
> Perhaps we're in agreement that *automatic* selection of hunks or
> whole files has little value.
> However, the main point of the feature I'm proposing is to allow
> manual conflict resolution in the middle of the update/switch/merge
> process. In other words, every time a conflict happens, a GUI tool
> pops up that allows you to edit the file on the spot and manually
> resolve conflicts. When you exit the tool, the merge process accepts
> your hand-merged file and continues on.

Right. I was not saying we should not do that. Just maybe the
automatic options are not the way to go right now. Especially in
light of our desire to wrap this up.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 9 12:52:56 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.