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

Re: Mismerge case

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-08-10 22:36:20 CEST

Greg Hudson <ghudson@MIT.EDU> writes:

> On Wed, 2005-08-10 at 21:05 +0100, Philip Martin wrote:
>> We could make Subversion's diff require context, like GNU diff3, but
>> at the expense of making some currently successful merges into
>> conflicts. Would that be an improvement? It's not clear; in lots of
>> cases Subversion's ability to merge without context produces the right
>> result in cases where GNU diff would produce a conflict.
> I claim that most three-way merge tools do require some context, and we
> are being abnormally aggressive in producing successful merges with no
> context.

How many of those merge tools are built on top of GNU diff?

I have no objections to somebody making merge context optional, but I
like the current behaviour.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 10 22:37:46 2005

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.