subversion/libsvn_client/merge.c

204  * contains only one element (added by do_mergeinfo_unaware_dir_merge)
242    * is locally added, then URL & REV are NULL & SVN_INVALID_REVNUM.
291      merge but got explicit mergeinfo added by the merge.  This is populated
316      represent the roots of subtrees added by the merge. */
732    to be added to the working copy TARGET_ABSPATH.
740    Examine the added mergeinfo, looking at each range (or single rev)
768   /* If PATH itself has been added there is no need to filter. */
1091   /* Make a record in BATON if we find a PATH where mergeinfo is added
1194   /* TRUE if the node was added by this merge. Otherwise FALSE */
1195   svn_boolean_t added;
1245   /* TRUE if the node was added by this merge. Otherwise FALSE */
1246   svn_boolean_t added;
1496   /* Update the lists of merged, skipped, tree-conflicted and added paths. */
1500       /* Issue #4166: If a previous merge added NOTIFY_ABSPATH, but we
1501          are now deleting it, then remove it from the list of added
1865       fb->added = TRUE;
1909                   && ((pdb && pdb->added) || fb->add_is_replace)))
2124  * When a node is replaced instead of just added a separate opened+deleted will
2125  * be invoked before the current open+added.
2171       && ( !fb->parent_baton || !fb->parent_baton->added))
2173       /* Store the roots of added subtrees */
2342  * When a node is replaced instead of just added a separate opened+added will
2495         db->added = TRUE;
2644       db->added = TRUE;
2690              && ((pdb && pdb->added) || db->add_is_replace)))
2758           /* Create the directory on disk, to allow descendants to be added */
2785                  We create a newly added directory with an original URL and
2918  * to this merge_dir_added() function all descendants will have been added.
2920  * When a node is replaced instead of just added a separate opened+deleted will
2921  * be invoked before the current open+added.
2962       && ( !db->parent_baton || !db->parent_baton->added))
2964       /* Store the roots of added subtrees */
2970       /* When the directory was added in merge_dir_added() we didn't update its
3033          ### This doesn't need a merge as we just added the node
3224        * the directory has local modifications (e.g. locally added
4166           /* We've been asked to operate on a locally added target, so its
6052    CHILDREN_WITH_MERGEINFO are also added to the array, limited by DEPTH
7272    *added* during a forward merge.  Removing natural history from explicit
7771    in any elements added to CHILDREN_WITH_MERGEINFO are initialized
7776    Any elements added to CHILDREN_WITH_MERGEINFO are allocated
7789   /* Iterate over each path with explicit mergeinfo added by the merge. */
7803          was added (with preexisting mergeinfo) by the merge.  That's actually
7906 /* Return true if any merged, skipped, added or tree-conflicted path
7911        to be recorded as 'merged' or 'skipped' or 'added', perhaps?
8430      the added complexity (and user confusion) of non-inheritable ranges.
8690   /* If no paths were added by the merge then we have nothing to do. */
8707       /* Grab the added path's explicit mergeinfo. */
8713       /* If the added path doesn't have explicit mergeinfo, does its immediate
8762              was added at some revions greater than MERGED_RANGE->START
8763              (assuming this is a forward merge).  It may have been added,
8764              deleted, and re-added many times.  The point is that we cannot
8786           /* Combine the explicit mergeinfo on the added path (if any)
8825    REVISION into RANGELIST. New elements added to rangelist are allocated
9511          merge explicit mergeinfo has already been set.  But for paths added
9514          describing *this* merge.  So the added path has either incomplete
9519          So here we look at the root path of each subtree added during the
9522       if (range.start < range.end) /* Nothing to record on added subtrees
9627    and also every path modified, skipped, added, or tree-conflicted
10200           /* Allow merge into added nodes. */
10280  * If the node is locally added, the rev and URL will be null/invalid. Some
10308        * locally added or locally deleted.
10310        * If it's locally added or deleted, find the repository root
11569  * a locally added node or if the source and target are not in the same
11602                                "locally added and therefore not related to "
12521   /* ### check for null URL (i.e. added path) here, like in reintegrate? */