Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "SvnMergeTheory" page has been changed by JulianFoad: http://wiki.apache.org/subversion/SvnMergeTheory?action=diff&rev1=27&rev2=28 Those are the basic cases that Subversion 1.7 supports. - TODO: How Subversion handles cherry-picks in the direction of sync merges. + == Cherry-pick Merges == + Subversion's ''sync'' merge handles cherry-picks in the same direction by skipping over them, splitting the merge into two or more phases, with each phase performing a 3-way merge of one sub-range of the requested source range. - Same dir'n -- svn succeeds. Opposite dir'n -- svn fails. + {{attachment:merge-cherry-fwd-sync-1.png|sync with a forward cherry-pick}} + + {{attachment:merge-cherry-fwd-sync-2.png|sync with a forward cherry-pick}} + + {{attachment:merge-cherry-fwd-sync-3.png|sync with a forward cherry-pick}} + + Subversion's ''sync'' merge handles cherry-picks in the same direction. + + {{attachment:merge-cherry-back-sync-1.png|sync with a backward cherry-pick}} == The Keep-Alive Dance == If you want to continue working on a branch after it has been reintegrated, we have been saying that there is a choice of two solutions:
