Re: wish: configurable control of merging conflict

Karl Chen <quarl@hkn.eecs.berkeley.edu> writes:

> 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.

Huh? Commit doesn't result in working copy conficts, did you mean
update?

Your example looks like the merge_adjacent_changes test in the file
subversion/tests/libsvn_diff/diff-diff3-test.c. Are you using an
external diff3? Perhaps you should try using the builtin merge.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org