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 Fri, 16 Mar 2012 10:17:32 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=73&rev2=74

Comment:
"The Origin of a Branch": add graphs, tweak wording.

  ----
  = Appendices =
  == Origin of a Branch ==
- As indicated in the quote by Brane at the top of this page, it shouldn't make any difference
in theory whether you branched B from A or A from B.  And indeed Subversion doesn't care.
 When tracing the youngest common ancestor of two branches (in terms of branching/copying,
that it, not in terms of merges) Subversion follows the "copy history" of each branch which
means it follows through both renames and branching.  The only thing that matters is that
the two branches have some common ancestor; one doesn't have to be a direct ancestor of the
other.
+ As indicated in the quote by Brane at the top of this page, it shouldn't make any difference
in theory whether you branched B from A:
  
- TODO: graphs showing branching B from A and A from B.
+ {{attachment:merge-origin-a.png|Merge Origin A}}
  
- Therefore in most of the graphs here, the common ancestor is shown as not being directly
on branch A nor on B.
+ or A from B:
  
- TODO: graph showing an indicative/abstract ancestor "O".
+ {{attachment:merge-origin-b.png|Merge Origin B}}
+ 
+ And indeed Subversion doesn't care.  When tracing the youngest common ancestor of two branches
(in terms of branching/copying, that it, not in terms of merges) Subversion follows the "copy
history" of each branch which means it follows through both renames and branching.  The only
thing that matters is that the two branches have some common ancestor.  Therefore, in most
of the graphs here, the common ancestor is shown indicatively as "O":
+ 
+ {{attachment:merge-origin-o.png|Merge Origin O}}
  
  == The Two Sides of a Merge ==
  The result of a 3-way merge can be seen from two sides.  Consider this simple scenario:

Mime
View raw message