subversion/libsvn_client/merge.c

282   /* The list of any paths which remained in conflict after a
319   /* A list of tree conflict victim absolute paths which may be NULL. */
509 /* Return whether any WC path was put in conflict by the merge
572 /* Create *LEFT and *RIGHT conflict versions for conflict victim
575  * Allocate returned conflict versions in RESULT_POOL. */
1136    conflict detection for incoming deletes */
1162      operation on it will be skipped and possibly cause a tree conflict on the
1167      merge. If this node is the shadow root its tree conflict status has been
1171   /* If a tree conflict will be installed once edited, it's reason. If a skip
1173      conflict.
1206      installed conflict */
1223      operation on it will be skipped and possibly cause a tree conflict
1228      is the shadow root its tree conflict status has been applied */
1231   /* If a tree conflict will be installed once edited, it's reason. If a skip
1288 /* Record a tree conflict in the WC, unless this is a dry run or a record-
1289  * only merge, or if a tree conflict is already flagged for the VICTIM_PATH.
1293  * The tree conflict, with its victim specified by VICTIM_PATH, is
1328        svn_wc_conflict_description2_t *conflict;
1367       conflict = svn_wc_conflict_description_create_tree2(
1371       conflict->action = action;
1372       conflict->reason = reason;
1379       SVN_ERR(svn_wc__add_tree_conflict(merge_b->ctx->wc_ctx, conflict,
1389                         conflict);
1589       /* open_directory() decided not to flag a tree conflict, but
1622       /* open_directory() decided that a tree conflict should be raised */
1672       /* open_directory() decided not to flag a tree conflict, but
1701       /* open_file() decided that a tree conflict should be raised */
1795              a tree conflict.
1843               return SVN_NO_ERROR; /* Already set a tree conflict */
1850               /* Earlier nodes found a conflict. Done. */
1879           /* Update the tree conflict to store that this is a replace */
1924               /* Set a tree conflict */
2033          name in case of a merge conflict */
2374           /* We found some modification. Parent should raise a tree conflict */
2400       /* The files differ, so raise a conflict instead of deleting */
2532              a tree conflict.
2585               return SVN_NO_ERROR; /* Already set a tree conflict */
2592               /* A sibling found a conflict. Done. */
2650               /* Update the tree conflict to store that this is a replace */
2704               /* Set a tree conflict */
2733                  over an existing tree conflict */
2735               /* ### These functions should take some tree conflict argument
2999          ### (or installed a tree conflict and skipped this node)*/
3187        * files, or property changes). Flag a tree conflict. */
7638                  performed before a conflict was encountered. */
9498  * If any conflict is raised during the merge, set *CONFLICTED_RANGE to
9499  * the revision sub-range that raised the conflict.  In this case, the
9870           /* Give the conflict resolver callback the opportunity to