Searched refs:conflicted_version (Results 1 – 4 of 4) sorted by relevance
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | wc_db_update_move.c | 1098 svn_wc_conflict_version_t *conflicted_version; in create_conflict_markers() local 1104 conflicted_version = svn_wc_conflict_version_dup( in create_conflict_markers() 1106 conflicted_version->node_kind = kind; in create_conflict_markers() 1111 part = svn_relpath_skip_ancestor(conflicted_version->path_in_repos, in create_conflict_markers() 1115 conflicted_version->path_in_repos in create_conflict_markers() 1116 = svn_relpath_join(conflicted_version->path_in_repos, part, scratch_pool); in create_conflict_markers() 1125 conflicted_version, in create_conflict_markers() 1132 conflicted_version, in create_conflict_markers() 1139 conflicted_version, in create_conflict_markers()
|
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | wc_db_update_move.c | 1098 svn_wc_conflict_version_t *conflicted_version; in create_conflict_markers() local 1104 conflicted_version = svn_wc_conflict_version_dup( in create_conflict_markers() 1106 conflicted_version->node_kind = kind; in create_conflict_markers() 1111 part = svn_relpath_skip_ancestor(conflicted_version->path_in_repos, in create_conflict_markers() 1115 conflicted_version->path_in_repos in create_conflict_markers() 1116 = svn_relpath_join(conflicted_version->path_in_repos, part, scratch_pool); in create_conflict_markers() 1125 conflicted_version, in create_conflict_markers() 1132 conflicted_version, in create_conflict_markers() 1139 conflicted_version, in create_conflict_markers()
|
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | wc_db_update_move.c | 1098 svn_wc_conflict_version_t *conflicted_version; in create_conflict_markers() local 1104 conflicted_version = svn_wc_conflict_version_dup( in create_conflict_markers() 1106 conflicted_version->node_kind = kind; in create_conflict_markers() 1111 part = svn_relpath_skip_ancestor(conflicted_version->path_in_repos, in create_conflict_markers() 1115 conflicted_version->path_in_repos in create_conflict_markers() 1116 = svn_relpath_join(conflicted_version->path_in_repos, part, scratch_pool); in create_conflict_markers() 1125 conflicted_version, in create_conflict_markers() 1132 conflicted_version, in create_conflict_markers() 1139 conflicted_version, in create_conflict_markers()
|
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
H A D | wc_db_update_move.c | 1098 svn_wc_conflict_version_t *conflicted_version; in create_conflict_markers() local 1104 conflicted_version = svn_wc_conflict_version_dup( in create_conflict_markers() 1106 conflicted_version->node_kind = kind; in create_conflict_markers() 1111 part = svn_relpath_skip_ancestor(conflicted_version->path_in_repos, in create_conflict_markers() 1115 conflicted_version->path_in_repos in create_conflict_markers() 1116 = svn_relpath_join(conflicted_version->path_in_repos, part, scratch_pool); in create_conflict_markers() 1125 conflicted_version, in create_conflict_markers() 1132 conflicted_version, in create_conflict_markers() 1139 conflicted_version, in create_conflict_markers()
|