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=54&rev2=55 Requested: - {{attachment:merge-cherry-fwd-sync-1.png|Cherry-Pick 1 and Sync Again}} + {{attachment:merge-cherry1-sync-1.png|Cherry-Pick 1 and Sync Again}} Performed as two phases: - {{attachment:merge-cherry-fwd-sync-2.png|Cherry-Pick 1 and Sync Again}} + {{attachment:merge-cherry1-sync-2.png|Cherry-Pick 1 and Sync Again}} - {{attachment:merge-cherry-fwd-sync-3.png|Cherry-Pick 1 and Sync Again}} + {{attachment:merge-cherry1-sync-3.png|Cherry-Pick 1 and Sync Again}} === Cherry-Pick 2 and Sync Again (Merge in Same Direction) === Subversion's ''sync'' merge doesn't handle cherry-picks in the opposite direction. Given this requested merge: - {{attachment:merge-cherry-back-sync-1.png|Cherry-Pick 2 and Sync Again}} + {{attachment:merge-cherry2-sync-1.png|Cherry-Pick 2 and Sync Again}} ... Subversion simply does not notice the cherry-pick and so performs a merge that attempts to re-apply some changes that originated on the target branch. This relies on (automatic and/or manual) conflict resolution to weed out the duplicate changes. - {{attachment:merge-cherry-back-sync-2.png|Cherry-Pick 2 and Sync Again}} + {{attachment:merge-cherry2-sync-2.png|Cherry-Pick 2 and Sync Again}} What ''should'' happen is A5 should be recognized as a (merge of a) change that we already have on B, and so the merge should be broken down into two phases, skipping A5, very similar to the ''same direction'' case, like this: - {{attachment:merge-cherry-back-sync-3.png|Cherry-Pick 2 and Sync Again}} + {{attachment:merge-cherry2-sync-3.png|Cherry-Pick 2 and Sync Again}} - {{attachment:merge-cherry-back-sync-4.png|Cherry-Pick 2 and Sync Again}} + {{attachment:merge-cherry2-sync-4.png|Cherry-Pick 2 and Sync Again}} === Cherry-Pick 3 and Sync Again (Merge in Same Direction) === Just like "Cherry-Pick 2 and Sync Again", Subversion currently does not notice the cherry-pick in this case, and what ''should'' happen is it should break the merge into two phases.
