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

Re: [merge tracking] [RFC] New merging algorithm

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-03-09 18:57:18 CET

On 3/9/07, Peter Lundblad <plundblad@google.com> wrote:
>
> Hi,
>
> I've spent some time looking into the algorithm in
> /branches/merge-tracking/subversion/libsvn_client/diff.c
> that tries to do the mergeinfo-sensitive merging and I think I have a
> better
> algorithm. Let me first recap my understanding of the current algorithm,
> then discuss problems with it and, after that, I'll sketch my version
> of the solution.

Not going to quote any more as my question is a little off to the side of
the details. One thing your proposal does not talk about is how it changes
the usability equation in terms of what happens when conflicts are
encountered. Does your proposal allow the merge to always run to completion
or are you allowing the merge process to do more and also improving the
overall consistency of the working copy when it does encounter a conflict
and needs to bail? I think it is the latter.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on Fri Mar 9 18:57:40 2007

This is an archived mail posted to the Subversion Dev mailing list.