[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-06-09 03:43:50 CEST

On 6/8/07, Mark Phippard <markphip@gmail.com> wrote:

> I was imagining the merge process could know that you said
> --accept=mine and when it encounters a conflicting hunk it could just
> apply the appropriate hunk and discard the other. No conflict would
> need to be generated in this case.

Yikes, do we really want to do that? That seems like a really
dangerous and reckless behavior.

I can understand someone saying, "just use my version", when they
*know* the server's version should definitely be tossed away. Usually
this happens when the two authors have had a conversation ahead of
time, perhaps realizing they made the same changes, and deciding to go
with just one person's version during the merge.

But what you're suggesting above is that a user accept a version that
is essentially a merged combination of two files, but that in the case
of any conflicting hunks, automatically resolve the hunk conflict in
one direction. This seems like a bad practice. If the file already
has smooth merges in it, conflicting hunks probably need a human to
examine in a case-by-case basis.

Really, I think the whole idea of having a computer automatically
choose a conflicting hunk *anytime* is fishy. Without a human
intervening, it seems like a sure-fire way to end up with a file that
doesn't even compile.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 9 03:57:48 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.