Searched refs:conflicted (Results 1 - 24 of 24) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Ddelete.c115 svn_boolean_t conflicted,
133 if (conflicted)
202 svn_boolean_t conflicted = FALSE;
211 NULL, &conflicted,
281 conflicted,
329 svn_boolean_t conflicted;
335 NULL, NULL, NULL, NULL, NULL, NULL, &conflicted,
394 conflicted,
110 create_delete_wq_items(svn_skel_t **work_items, svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t kind, svn_boolean_t conflicted, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
201 svn_boolean_t conflicted = FALSE; local
328 svn_boolean_t conflicted; local
H A Dupdate_editor.c94 * a. tree/text/prop change to node beneath tree-conflicted dir
95 * then # Skip all changes in this conflicted subtree [*1]:
98 * for the whole conflicted subtree
101 * b. tree/text/prop change to tree-conflicted dir/file, or
102 * c. tree change to a text/prop-conflicted file/dir, or
103 * d. text/prop change to a text/prop-conflicted file/dir [*2], or
637 already_in_a_tree_conflict(svn_boolean_t *conflicted,
842 return SVN_NO_ERROR; /* Not conflicted */
1548 /* If LOCAL_ABSPATH is inside a conflicted tree and the conflict is
1553 already_in_a_tree_conflict(svn_boolean_t *conflicted,
1549 already_in_a_tree_conflict(svn_boolean_t *conflicted, svn_boolean_t *ignored, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *scratch_pool) argument
1589 node_already_conflicted(svn_boolean_t *conflicted, svn_boolean_t *conflict_ignored, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *scratch_pool) argument
1618 svn_boolean_t conflicted; local
1862 svn_boolean_t conflicted; local
2242 svn_boolean_t conflicted; local
3092 svn_boolean_t conflicted; local
3437 svn_boolean_t conflicted; local
[all...]
H A Dcopy.c230 svn_boolean_t conflicted,
256 if (conflicted)
274 /* not text conflicted */
448 metadata_only, info->conflicted,
593 svn_boolean_t conflicted;
621 NULL, &conflicted, NULL, NULL, NULL, NULL,
844 metadata_only, conflicted, is_move,
1033 if (info->conflicted)
1073 svn_boolean_t conflicted;
1130 &conflicted, NUL
222 copy_versioned_file(svn_wc__db_t *db, const char *src_abspath, const char *dst_abspath, const char *dst_op_root_abspath, const char *tmpdir_abspath, svn_boolean_t metadata_only, svn_boolean_t conflicted, svn_boolean_t is_move, const svn_io_dirent2_t *dirent, svn_filesize_t recorded_size, apr_time_t recorded_time, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool) argument
591 svn_boolean_t conflicted; local
1071 svn_boolean_t conflicted; local
[all...]
H A Dinfo.c96 svn_boolean_t conflicted;
123 &conflicted, &op_root, NULL, NULL,
286 if (conflicted)
95 svn_boolean_t conflicted; local
H A Dstatus.c361 svn_boolean_t conflicted;
504 conflicted = info->conflicted;
505 if (conflicted)
516 conflicted = FALSE;
602 && (! conflicted)
689 stat->conflicted = conflicted;
772 tree conflict victim, report it as conflicted. */
783 stat->conflicted
358 svn_boolean_t conflicted; local
1098 svn_boolean_t conflicted = info ? info->conflicted local
[all...]
H A Dadm_crawler.c388 svn_boolean_t conflicted; local
393 NULL, NULL, NULL, NULL, &conflicted,
413 conflicted, use_commit_times,
724 svn_boolean_t conflicted;
729 NULL, &conflicted, NULL, NULL, NULL, NULL,
750 wrk_kind, conflicted, use_commit_times,
723 svn_boolean_t conflicted; local
H A Dwc_db_wcroot.c880 svn_boolean_t conflicted;
893 NULL, NULL, NULL, &conflicted,
909 * Ignore non-conflicted not-present/excluded nodes.
915 && !conflicted);
879 svn_boolean_t conflicted; local
H A Dwc_db_private.h249 svn_boolean_t *conflicted,
H A Dadm_ops.c417 svn_boolean_t conflicted;
423 &conflicted,
444 if (conflicted)
416 svn_boolean_t conflicted; local
H A Dmerge.c781 * conflicted them needlessly, while merge_text_file figured it out
808 * If a conflict occurs, set *MERGE_OUTCOME to 'conflicted', and (unless
1141 file as conflicted, so we need to compensate. */
1249 svn_boolean_t conflicted;
1254 &conflicted, NULL, &had_props, &props_mod,
1268 if (conflicted)
1286 _("Can't merge into conflicted node '%s'"),
1248 svn_boolean_t conflicted; local
H A Dprops.c182 svn_boolean_t conflicted;
192 NULL, NULL, NULL, NULL, NULL, &conflicted, NULL,
216 else if (conflicted)
234 _("Can't merge into conflicted node '%s'"),
831 * - conflicted
1286 even `conflicted'. */
180 svn_boolean_t conflicted; local
H A Dwc_db.h425 node will be record as conflicted (in ACTUAL).
493 node will be record as conflicted (in ACTUAL).
551 node will be record as conflicted (in ACTUAL).
629 node will be record as conflicted (in ACTUAL).
660 node will be record as conflicted (in ACTUAL).
1636 Any work items that are necessary as part of marking this node conflicted
1957 svn_boolean_t *conflicted,
2002 svn_boolean_t conflicted; member in struct:svn_wc__db_info_t
2342 LOCAL_ABSPATH in DB that are conflicted.
2552 a conflicted stat
[all...]
H A Dentries.c416 svn_boolean_t conflicted;
445 &conflicted,
938 if (conflicted)
2008 parent node, 1.7 stores them directly on the conflicted nodes.
415 svn_boolean_t conflicted; local
H A Dwc_db.c324 svn_boolean_t *conflicted,
8825 svn_boolean_t *conflicted,
8851 if (changelist || conflicted || props_mod)
8988 if (conflicted)
8992 *conflicted =
8996 *conflicted = FALSE;
9059 SVN_ERR_ASSERT(conflicted);
9101 if (conflicted)
9102 *conflicted = TRUE;
9150 svn_boolean_t *conflicted,
8807 read_info(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, apr_int64_t *repos_id, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, apr_int64_t *original_repos_id, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *had_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9132 svn_wc__db_read_info_internal(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, apr_int64_t *repos_id, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, apr_int64_t *original_repos_id, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *had_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9175 svn_wc__db_read_info(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, const char **repos_root_url, const char **repos_uuid, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, const char **original_root_url, const char **original_uuid, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *have_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dconflicts.c649 *ppropnames = NULL; /* remove all conflicted property names */
661 /* If no conflicted property names left */
901 /* Get conflicted properties */
1920 ### conflicted paths. Eventually this code will be the base for 'svn resolve'
1929 apr_hash_t *conflicted;
1938 &conflicted,
1951 for (hi = apr_hash_first(scratch_pool, conflicted);
2020 up the conflicts before we mark the file 'conflicted' */
2485 return SVN_NO_ERROR; /* This property is not conflicted! */
2504 conflicted propertie
1928 apr_hash_t *conflicted; local
[all...]
H A Ddeprecated.c2815 if (old_status->conflicted)
2884 && old_status->conflicted
/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dstatus.c75 if (!status->versioned && status->conflicted)
131 case svn_wc_status_conflicted: return "conflicted";
251 if (status->conflicted)
485 if (status->conflicted)
514 svn_hash_sets(att_hash, "tree-conflicted", "true");
593 || status->conflicted
606 && (! status->conflicted))
621 && (! status->conflicted))
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dstatus.c784 (*cst)->conflicted = status->conflicted;
832 if (status->versioned && status->conflicted)
H A Dcommit_util.c283 * Determine whether we are within a tree-conflicted subtree of the
618 when we perform a normal commit. But if a node is conflicted we want
624 if (!copy_mode && !status->conflicted
656 if (status->conflicted && matches_changelists)
692 if (status->conflicted && status->kind == svn_node_unknown)
1225 * marked as tree-conflicted. */
H A Dshelf2.c1008 if (status->conflicted)
H A Dpatch.c540 status->conflicted)
3357 /* ### TODO mark file as conflicted. */
H A Dconflicts.c79 * on the conflicted node. */
12790 "given for conflicted path '%s'"),
12839 "given for conflicted path '%s'"),
12892 "given for conflicted path '%s'"),
13371 if (!status->conflicted)
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_client.h2391 svn_boolean_t conflicted;
4564 * @defgroup Conflicts Dealing with conflicted paths.
4570 * An opaque type which represents a conflicted node in the working copy.
4851 * Return a conflict for the conflicted path @a local_abspath.
4902 * It contains the names of conflicted properties. If no property conflict
5103 * Return the absolute path to the conflicted working copy node described
5131 * or merge operation conflicted with the state of the node in the working copy.
5159 * old version of the conflicted node described by @a conflict.
5339 * Return the MIME-type of the working version of the text-conflicted file
5349 * Return absolute paths to the versions of the text-conflicted fil
2389 svn_boolean_t conflicted; member in struct:svn_client_status_t
[all...]
H A Dsvn_wc.h1228 /** The operation skipped the path because it was conflicted.
1603 * for later (allowing libsvn_wc to mark the path "conflicted" as
1833 /** The incoming action being attempted on the conflicted node or property.
1976 /** The action being attempted on the conflicted node or property.
2178 'conflicted', so user can run 'svn resolved' later. */
2188 svn_wc_conflict_choose_theirs_conflict, /**< incoming (for conflicted hunks) */
2189 svn_wc_conflict_choose_mine_conflict, /**< own (for conflicted hunks) */
2969 /** old version of conflicted file. A file basename, relative to the
2973 /** new version of conflicted file. A file basename, relative to the
2977 /** working version of conflicted fil
3738 svn_boolean_t conflicted; member in struct:svn_wc_status3_t
[all...]

Completed in 531 milliseconds