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

Re: Saving merge history (was: Re: merge should copy-with-history)

From: William Uther <will+_at_cs.cmu.edu>
Date: 2002-08-13 00:18:14 CEST

On Monday, August 12, 2002, at 05:25 PM, Branko ibej wrote:

> William Uther wrote:
>>
>> On Monday, August 12, 2002, at 07:50 AM, brane@xbc.nu wrote:
>>
>>> You have to be able to track individual diff hunks, not just whole
>>> files. For
>>> example, after a merge each diff hunk in the merge candidates can be
>>> in one of
>>> the following states:
>>
>> [snip - states]
>>
>> Okie - I see this as internal to the delta combiner. I don't see why
>> we need to store merge information on this level.
>
> You misunderstand. The delta combiner doesn't need this information. We
> need it for variance-adjusted (a.k.a genetic) merging.

Heh, but variance-adjusted merging can be built on top of the
delta-combiner... I wrote an email to the dev list about this back in
february :).
(http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=162878)

(Although I don't know much about svndiff, so that email may be a little
naive. I think it is pretty close though.)

later,

\x/ill :-}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 13 00:19:33 2002

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.