Re: Mismerge case

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.

---------------------------------------------------------------------
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:19:52 2005