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] Trivial Update of "SvnMergeTheory" by JulianFoad
Date Tue, 31 Jan 2012 09:37:13 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=3&rev2=4

  
  In the following example, two sync merges are shown.  Let's jump straight to examining the
second one.  (It is easy to see how the first one was performed).
  
+ {{attachment:merge-sync-1-req.png|requested sync merge}}
+ 
- {{attachment:merge-sync-1-req.png|requested sync merge}} To perform the second sync merge
(before it was committed as revision B5), Subversion:
+ To perform the second sync merge (before it was committed as revision B5), Subversion:
  
   * Found the common ancestor of A and B, which is point O on the diagram.
   * Considered all the changes along the history of branch A, after the common ancestor O
up to and including A4. The changes are: A1, A2, A3, A4.

Mime
View raw message