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=10&rev2=11 The UI may also provide the user with a way to tell Subversion that he/she has merged a given logical change into the WC manually (not using the 'merge' command), or has merged a change into the WC and then decided to remove it before committing and not record it as merged. The command-line interface for these is "svn merge --record-only". }}} - ### NEW text to be edited in: In order to make sense of this, I consider the definition of a tracked change to be: @@ -108, +107 @@ 1. You should NOT cherry-pick a change from A to B or from B to A that is already recorded on the target branch. (Subversion attempts the merge but does not record it.) (### Are we sure?) ==== Multiple Branches ==== + A rough summary of the multiple-branch rules would be: "You must not merge changes between any two branches A and B through more than one route." + 1. The ''Feature Branch'' relationship can be daisy-chained. * A ⇒ B, B ⇒ C, C ⇒ D, … @@ -115, +116 @@ * A ⇒ B, A ⇒ B2, A ⇒ B3, … 1. The ''Feature Branch'' relationship cannot be applied many-to-one. * '''NO: '''A ⇒ B, A2 ⇒ B, A3 ⇒ B, … + (That would be a very strange and probably nonsensical branching pattern.) 1. The ''Feature Branch'' relationship cannot be applied with cycles in the graph of relationships. * '''NO:''' A ⇒ B, B ⇒ A
