wish: configurable control of merging conflict

Hi,

Feature request: how about a property that controls how many lines
changes have to be apart when merging, to constitute a conflict?

For example:

File foo r100:

line1
line2
line3

Alice changes foo to
line1
line2a
line3

And commits r101.

Bob changes foo r100 to
line1
line2
line3b

And wants to commit.

Currently in subversion (like rcs,cvs), this is marked as a conflict.

However, there are many applications where adjacent line changes are
never conflicts. Maybe also situations where you want to be more
careful and have changes 2,3,etc lines apart get marked as conflict.
There should be a way to specify this. One way could be to create a
property "svn:conflict-lines" (default 1) which specifies how many
lines to "overlap" changes when merging to look for conflicts.

-- 
Karl Chen / quarl@quarl.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org