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

Re: more on svn diff / svn merge stuff

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-01-30 23:46:17 CET

Karl Fogel wrote:

>Branko Čibej <brane@xbc.nu> writes:
>
>>BTW; how about 3-way merges?
>>
>
>Just a quick check: is "3-way merge" the usual name for the technique
>described in
>
> http://svn.collab.net/repos/svn/trunk/www/variance-adjusted-patching.html
>
>?
>
>(I think when I wrote that doc, I didn't realize that this is what the
>term "3-way merge" meant... :-) )
>

No, it's not quite like that. A 3-way merge from A to B involves
patching B with the diff between A and the closest common ancestor of A
and B. This is what should happen when you merge two (related) branches.

Your doc talks about adjusting the patch set for several successive
merges. That's the next step beyond 3-way merging.

>
>
>-K
>
>>> Less sure that "svn update" can benefit
>>>
>>>from factorization here, but even without that it will be a pretty
>>
>>>nice win -- in the "svn diff" code, much of the non-elegance Philip
>>>noted in various comments is going away.
>>>
>>>The smallest chunks into which I can reasonably divide this change are
>>>still pretty big, hence no commit yet, but soon.
>>>
>>>-K
>>>
>>>---------------------------------------------------------------------
>>>To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>>>For additional commands, e-mail: dev-help@subversion.tigris.org
>>>
>>
>>--
>>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
>>
>

-- 
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 Sat Oct 21 14:37:01 2006

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