[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: Branko Čibej <brane_at_xbc.nu>
Date: 2002-08-12 23:25:38 CEST

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.

>> What you propose only gives you "merged" and "ignored" info for whole
>> file contents.
> Er, it gives you enough to recreate the original svn command line, and
> hence enough to do anything else. Unless you are planning to save
> information about exactly how the user resolved conflicts (more than
> just looking at the result of that resolution, which you have), then
> this has all the information.

This is exactly why we'd use this information.

>>> I don't see that tracking individual diff
>>> hunks is necessary though - just a modified form of the delta combiner
>> ^^^^
>> Oh, right. You're absolutely right. A changeset engine _is_ a
>> modified form of
>> the delta combiner. The trouble is that the "just" happens to hide a
>> slightly
>> huge amount of work. :-)
> I agree that USING this information is a lot of work. And there is
> quite possibly a format that would help that. That is post-1.0 though.

No, producing it in a useful format isn't trivial, either. My example
with the hunk states only applies to merging. There are all sorts of
things you have to know in order to produce a minimal, non-conflicting
set of changesets -- very much like what BK can do.

But let's leave that for pos-1.0.

(I'll reply to the rest of your post in a separate message.)

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 12 23:26:15 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.