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=48&rev2=49 More significantly, neither does the mergeinfo "B:1-4" accurately describe the set of ''physical changes'' that were merged. The physical (3-way) merge took the difference between A2 and B4, which we can describe as A2:B3 followed by B3:B4. The second part (B3:B4) we can descibe in mergeinfo syntax as "B:4". The first part, A2:B3, we can't describe using mergeinfo syntax. Logically it's equivalent to changes B1 and B2, but it's not physically the same, because A2:B3 is the rewriting of B1 and B2 into the context of branch A. (See [[#The_Two_Sides_of_a_Merge|The Two Sides of a Merge]], below, for clarification.) == Cherry-pick Merges == + [Note: This section is rather long, and should be considered more as reference material than an introduction, as it aims to set out all the possible cases.] + A ''cherry-pick'' merge, for our purposes here, is one that takes from the source branch a change that is ''not'' the first unmerged change, thus leaving an "gap" of unmerged changes between sequences of merged changes. By contrast, a ''complete'' merge (a ''sync'' or a ''reintegrate'') ensures that all source changes up to and including the specified one are merged to the target. We are not going to discuss here ''how'' a cherry-pick merge is performed. (See FourWayCherryPick for an interesting side note about that.) Instead we are concerned with how a complete merge will account for any changes that have already been merged by cherry-picking.
