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=89&rev2=90 Comment: More on Mixed-Rev, Switched, Sparse The merge API may check for these conditions and raise an error. For conditions that the implementation can handle, the check should be overridable. + === Requirements === - === Mixed-Rev WC === + ==== Mixed-Rev WC ==== + No use cases known; just a minor convenience for the user. + + ==== Switched Paths in the WC ==== + For a merge that affects paths both inside and outside a switched subtree: No use cases known. + + For a merge that affects paths inside or outside a switched subtree but not both: This seems like it could sometimes be convenient, when the user knows that a given merge will affect either paths inside or outside a switched subtree but not both. + + See [[http://svn.haxx.se/dev/archive-2012-04/0399.shtml|my reply]] and any subsequent replies for an attempt to capture the rationale for the existing behaviour in the form of a requirement spec. + + ==== Sparse WC ==== [TODO] + === Functional Spec === + ==== Mixed-Rev WC ==== + [TODO] + - === Switched Paths in the WC === + ==== Switched Paths in the WC ==== - See the section "[[http://svn.apache.org/repos/asf/subversion/trunk/notes/merge-tracking/func-spec.html#switched-paths|Switched Paths]]" in the merge tracking functional spec. + See the section "[[http://svn.apache.org/repos/asf/subversion/trunk/notes/merge-tracking/func-spec.html#switched-paths|Switched Paths]]" in the merge tracking functional spec. Fuller explanation of the first two bullet points, see [[http://svn.haxx.se/dev/archive-2012-03/0632.shtml|Paul's email]]. See [[http://svn.haxx.se/dev/archive-2012-04/0399.shtml|my reply]] and any subsequent replies for more, including deleting a switched path. - === Sparse WC === + ==== Sparse WC ==== See the section "[[http://svn.apache.org/repos/asf/subversion/trunk/notes/merge-tracking/func-spec.html#sparse-checkouts|Sparse Checkouts]]" in the merge tracking functional spec. + + [TODO] How does 'depth' work if you have added children to a directory that was initially sparse (and so presumably still recorded in the WC as being 'sparse') or, conversely, have excluded children from a directory that was initially depth non-empty? == Cherry-pick Merges == [Note: This section is rather long, and should be considered more as reference material than an introduction, as it aims to set out all the possible cases.]
