Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SupportedMergeScenarios" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SupportedMergeScenarios?action=diff&rev1=1&rev2=2 The whole subject of merge tracking is about whether to port the a given ''logical change'' onto the target branch, or whether that ''logical change'' has already been put there. The question is not about the physical representation of that change; it doesn’t matter whether the change was achieved on the target branch by exactly the same physical edits as it was in the source branch. The merge algorithm cannot possibly know whether the physical change that was committed (at the time when the merge info says the merge happened) accurately represents the ''logical change'' that is claimed, but if it doesn’t (or indeed if it is totally unrelated), then something has gone wrong at a higher level. As far as ''merge tracking'' is concerned, that change was merged. == Merging Scenarios for Subversion 1.6 == - Key: + ||||<style="text-align: center;">'''Key''' || + ||A, B, C, … ||branches || + ||A:3 ||the change in branch A that was committed as revision 3 || + ||A ⇒ B ||a high-level relationship assumed between branches A and B, in the indicated direction || + ||A → B ||a merge from branch A to branch B || - * A, B, C, … branches - * A:3 the change in branch A that was committed as revision 3 - * A ⇒ B a high-level relationship assumed between branches A and B, in the indicated direction - * A → B a merge from branch A to branch B ### TODO: Diagrams. This needs to be more visual to be easily understood. === General Concepts ===
