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=88&rev2=89 Comment: Add a section on Mixed-Rev, Switched, or Sparse WC The merge '`svn merge ^/trunk@110`' (into `^/branch`) would break the merge into the following ranges: [100], [101-103], [104], [105-107], [108-110]. Each range would be treated independently, and an actual merge will only be attempted on the subtrees that do not indicate they have already been merged that range. (For example, the [101-103] range would not be merged into the `^/branch/B` subtree. It would be merged into its parents and siblings, though, just as with '`svn up --set-depth=exclude B && svn merge -c 101:103 --disregard-mergeinfo`'.) + == Mixed-Rev, Switched, or Sparse WC == + This section considers conditions of the target WC that have little to do with the functioning of the symmetric merge algorithm itself but affect the way the implementation works when applying changes into the target WC. + + The target WC may have any of the following conditions. + + * mixed-revision (not all nodes have the same base revision) + * contains any switched subtrees + * is sparse (incomplete) + * ... + + Often, for a merge target, some of these conditions are considered to be undesirable because they tend to add complexity without providing a needed benefit for the user. In some cases there may be benefits for the user. + + The merge API may check for these conditions and raise an error. For conditions that the implementation can handle, the check should be overridable. + + === Mixed-Rev WC === + [TODO] + + === 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. + + === 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. + == 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.]
