subversion/libsvn_client/merge.c

203  * contains only one element (added by do_mergeinfo_unaware_dir_merge)
241    * is locally added, then URL & REV are NULL & SVN_INVALID_REVNUM.
290      merge but got explicit mergeinfo added by the merge.  This is populated
315      represent the roots of subtrees added by the merge. */
735    to be added to the working copy TARGET_ABSPATH.
743    Examine the added mergeinfo, looking at each range (or single rev)
771   /* If PATH itself has been added there is no need to filter. */
1094   /* Make a record in BATON if we find a PATH where mergeinfo is added
1200   /* TRUE if the node was added by this merge. Otherwise FALSE */
1201   svn_boolean_t added;
1254   /* TRUE if the node was added by this merge. Otherwise FALSE */
1255   svn_boolean_t added;
1551   /* Update the lists of merged, skipped, tree-conflicted and added paths. */
1555       /* Issue #4166: If a previous merge added NOTIFY_ABSPATH, but we
1556          are now deleting it, then remove it from the list of added
1900           svn_boolean_t added;
1903           SVN_ERR(svn_wc__node_is_added(&added, merge_b->ctx->wc_ctx,
1906           fb->tree_conflict_reason = added ? svn_wc_conflict_reason_added
1941       fb->added = TRUE;
1987                   && ((pdb && pdb->added) || fb->add_is_replace)))
2008               svn_boolean_t added;
2011               SVN_ERR(svn_wc__node_is_added(&added, merge_b->ctx->wc_ctx,
2014               fb->tree_conflict_reason = added ? svn_wc_conflict_reason_added
2209  * When a node is replaced instead of just added a separate opened+deleted will
2210  * be invoked before the current open+added.
2256       && ( !fb->parent_baton || !fb->parent_baton->added))
2258       /* Store the roots of added subtrees */
2457  * When a node is replaced instead of just added a separate opened+added will
2622         db->added = TRUE;
2716           svn_boolean_t added;
2719           SVN_ERR(svn_wc__node_is_added(&added, merge_b->ctx->wc_ctx,
2722           db->tree_conflict_reason = added ? svn_wc_conflict_reason_added
2775       db->added = TRUE;
2823              && ((pdb && pdb->added) || db->add_is_replace)))
2866               svn_boolean_t added;
2869               SVN_ERR(svn_wc__node_is_added(&added, merge_b->ctx->wc_ctx,
2872               db->tree_conflict_reason = added ? svn_wc_conflict_reason_added
2892           /* Create the directory on disk, to allow descendants to be added */
2919                  We create a newly added directory with an original URL and
3056  * to this merge_dir_added() function all descendants will have been added.
3058  * When a node is replaced instead of just added a separate opened+deleted will
3059  * be invoked before the current open+added.
3100       && ( !db->parent_baton || !db->parent_baton->added))
3102       /* Store the roots of added subtrees */
3108       /* When the directory was added in merge_dir_added() we didn't update its
3171          ### This doesn't need a merge as we just added the node
3362        * the directory has local modifications (e.g. locally added
4291           /* We've been asked to operate on a locally added target, so its
6176    CHILDREN_WITH_MERGEINFO are also added to the array, limited by DEPTH
7399    *added* during a forward merge.  Removing natural history from explicit
7898    in any elements added to CHILDREN_WITH_MERGEINFO are initialized
7903    Any elements added to CHILDREN_WITH_MERGEINFO are allocated
7916   /* Iterate over each path with explicit mergeinfo added by the merge. */
7930          was added (with preexisting mergeinfo) by the merge.  That's actually
8033 /* Return true if any merged, skipped, added or tree-conflicted path
8038        to be recorded as 'merged' or 'skipped' or 'added', perhaps?
8557      the added complexity (and user confusion) of non-inheritable ranges.
8817   /* If no paths were added by the merge then we have nothing to do. */
8834       /* Grab the added path's explicit mergeinfo. */
8840       /* If the added path doesn't have explicit mergeinfo, does its immediate
8889              was added at some revions greater than MERGED_RANGE->START
8890              (assuming this is a forward merge).  It may have been added,
8891              deleted, and re-added many times.  The point is that we cannot
8913           /* Combine the explicit mergeinfo on the added path (if any)
8952    REVISION into RANGELIST. New elements added to rangelist are allocated
9637          merge explicit mergeinfo has already been set.  But for paths added
9640          describing *this* merge.  So the added path has either incomplete
9645          So here we look at the root path of each subtree added during the
9648       if (range.start < range.end) /* Nothing to record on added subtrees
9753    and also every path modified, skipped, added, or tree-conflicted
10326           /* Allow merge into added nodes. */
10406  * If the node is locally added, the rev and URL will be null/invalid. Some
10434        * locally added or locally deleted.
10436        * If it's locally added or deleted, find the repository root
11703  * a locally added node or if the source and target are not in the same
11733                                "locally added and therefore not related to "
12669                                "because it is locally added and therefore "