subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache subversion Wiki <comm...@subversion.apache.org>
Subject [Subversion Wiki] Update of "SvnMergeTheory" by JulianFoad
Date Tue, 31 Jan 2012 13:19:58 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.

The "SvnMergeTheory" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=8&rev2=9

  But what's the mergeinfo? [TODO...]
  
  == 3-way merge ==
- Subversion currently performs any requested merge as a sequence of 3-way merges.  For simple
''sync'' and ''reintegrate'' merges, that's exactly what's needed.
+ Subversion currently performs any requested merge as a sequence of 3-way merges.  For simple
''sync'' and ''reintegrate'' merges, that's exactly what's needed.  Usually there is just
one 3-way merge, but if cherry-picks are being skipped then Subversion breaks down the merge
source range into sub-ranges and performs one 3-way merge per sub-range.
  
- For a ''cherry-pick'' merge, that's not quite right, and a 4-way merge would be more correct.
+ For a ''cherry-pick'' merge, a 3-way merge is not quite right, and a [[http://svn.apache.org/viewvc/subversion/trunk/notes/variance-adjusted-patching.html|4-way
merge]] would be more correct.
+ 
+ [TODO: diagram of cherry-pick as 4-way merge]
  
  == Drawing Merge Graphs ==
  The graphs in this page are constructed with the program [[http://svn.apache.org/viewvc/subversion/trunk/tools/dev/merge-graph.py|merge-graph.py]]
from configuration files such as [[attachment:merge-reint-1.txt]].

Mime
View raw message