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 "SymmetricMerge" by JulianFoad
Date Tue, 10 Apr 2012 13:20:00 GMT
Dear Wiki user,

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

The "SymmetricMerge" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/SymmetricMerge?action=diff&rev1=79&rev2=80

Comment:
Add terminology entry "natural history".

  == Terminology ==
   complete merge:: A merge that merges all the changes from the source branch that have not
yet been merged into the target. A ''sync'' merge and a ''reintegrate'' merge and a ''symmetric''
merge are all ''complete'' merges.
   symmetric merge:: A ''complete merge'' that works in either direction between two branches,
no matter which branch is regarded as the parent and which as the child, and no matter which
direction any previous merges between those branches were performed.  A ''complete merge''
is the normal kind of merge in systems such as ClearCase; this paper is about developing such
a merge in Subversion.
+  natural history:: The sequence of path-revision coordinates where a node existed, if you
trace it back through history along its normal changes and any copy-from links. Nothing to
do with merge arrows.
  
  == Drawing The 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]] which may be found alongside
the corresponding '''.png''' files as attachments to the Wiki page.

Mime
View raw message