On Jun 25, 2005, at 9:25 AM, Greg Hudson wrote:
>
>> The algorithm above suggests that because the two starting
>> values
>> (A and C) are unequal, we should flag a conflict. But our
>> current
>> diff3 algorithm on lines-of-text may actually not care about the
>> target base; it might produce a smooth merge because the
>> *results*
>> are the same.
>>
>
> One possible justification for this behavior is that the text-base of
> the working copy can be seen as an arbitrary intermediate point in
> time.
> It's not necessarily the repository head revision, even; it's just
> what
> you happened to have checked out. (Although you'll get an out-of-date
> error on checkin if it's not the head, I suppose.)
>
> Even if we were going to make Subversion do four-way text merges using
> variance-adjusted patching, I'm not sure that the working copy text
> base
> would be part of any merges. I think the fourth point would come from
> merge-tracking information.
I just verified that in the case of a single line of text, the text-
base is indeed ignored in our 4-way scenario. 'svn merge' produces a
simple 'G', as my footnote hypothesized it might.
Rather than get ourselves all tangled in merge-tracking design, I
think I'll just imitate this behavior when merging properties. We
can always get more sophisticated later on.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 27 18:10:50 2005