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 DanielShahaf
Date Thu, 15 Mar 2012 17:09:29 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 DanielShahaf:
http://wiki.apache.org/subversion/SymmetricMerge?action=diff&rev1=67&rev2=68

Comment:
cherry: another degenerate case

  
   * The source change is already on the target branch (such as A1 or B2 in the 'cherry 1'
graph), which is a no-op.
   * The source change is the first source change that hasn't already been merged to the target
(such as A2), which turns into a sync merge.
+  * The cherry pick occurs before any sync or reintegrate merge.  In this case the last 'complete
merge' point is the branch point (common ancestor).
  
  We need to consider each case in two contexts: when the next complete merge is in the same
direction as, or in the opposite direction from the last complete merge.  We'll call the first
context "Sync Again" for short, and the second context "Reintegrate".  The base for the (initial)
3-way merge will be on the source branch in the first context, and on the target branch in
the second context.
  

Mime
View raw message