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=49&rev2=50 Certainly we will have to account for cherry-pick merges as well, but the main focus here is on ''complete'' merges. We investigate how Subversion's ''sync'' and ''reintegrate'' merges relate to the symmetric model of merging, and how we could move Subversion towards that model. === Abstract === + The essence of this document is that it looks like we can relatively easily enhance Subversion so that a plain 'merge' command will act as either 'sync' or 'reintegrate' automatically, depending on the history of the branch, and furthermore will work better than either of them in the scenario of continuing work on a branch after a reintegrate. + We explain how Subversion performs ''sync'' and ''reintegrate'' merges, expressing the results in terms of copying ''logical changes'' from one branch to another. We compare this with the way a ''symmetric'' merge would handle the same cases, and we see how the ''symmetric'' merge can handle a much bigger set of useful cases. We also show how previous ''cherry-pick'' merges are currently handled and how they would be handled by a symmetric merge. In particular, we show the limitations of using the so-called ''keep-alive dance'' after reintegrating a branch, and we show how much better the symmetric merge is in this scenario.
