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=16&rev2=17 Comment: Add a disclaimer ''Design notes, plans and ideas by JulianFoad'' + + ''This is not part of the official documentation of Subversion. It is aimed at the developers of Subversion, and may not reflect reality or the project community's plans. For official documentation, see'' http://subversion.apache.org/docs/''.'' ---- = What Merges Does Svn’s Merge Tracking Support? = @@ -58, +60 @@ Since Subversion 1.5 (through 1.8 at least), the merge tracking stores mergeinfo ''transitively'', so after merging a change from A to B to C, the mergeinfo on branch C will list both the change on branch B that was merged directly to C, and also the change(s) in branch A that were merged directly to branch B and therefore indirectly to branch C. This partly serves to make the merge tracking act as if it is tracking logical changes. A subsequent merge from A to C will not repeat the same changes that are recorded as already merge (indirectly) from A to C, and so in that case it correctly avoids re-merging the logical changes from A that are already on C. But if we try things another way round -- first merge from A to C, and then from A to B to C, the last merge (B to C) will wrongly repeat the changes that already arrived on C in the first merge (directly from A). == Merging Scenarios for Subversion 1.5 through 1.7 == - This section aims to describe the restrictions that should be observed in order for merge tracking to remain effective in Subversion 1.5 through 1.7. - ||||<style="text-align:center;"> || ||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.
