diff options
Diffstat (limited to 'subversion/libsvn_wc/wc_db.c')
| -rw-r--r-- | subversion/libsvn_wc/wc_db.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/subversion/libsvn_wc/wc_db.c b/subversion/libsvn_wc/wc_db.c index fe09974..c76a8b1 100644 --- a/subversion/libsvn_wc/wc_db.c +++ b/subversion/libsvn_wc/wc_db.c @@ -2374,7 +2374,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcroot, /* For file externals we only want to place a not present marker if there is a BASE parent */ - + svn_relpath_split(&parent_local_relpath, &name, local_relpath, scratch_pool); @@ -6702,7 +6702,7 @@ svn_wc__db_op_mark_resolved_internal(svn_wc__db_wcroot_t *wcroot, return SVN_NO_ERROR; conflicts = svn_skel__parse(conflict_data, conflict_len, scratch_pool); - + SVN_ERR(svn_wc__conflict_skel_resolve(&resolved_all, conflicts, db, wcroot->abspath, @@ -7991,7 +7991,7 @@ struct op_delete_baton_t { * Note that the following sequence results in the same DB state: * mv A B; mv B/F B/G * We do not care about the order the moves were performed in. - * For details, see http://wiki.apache.org/subversion/MultiLayerMoves + * For details, see https://cwiki.apache.org/confluence/display/SVN/MultiLayerMoves */ struct moved_node_t { /* The source of the move. */ @@ -8396,7 +8396,7 @@ delete_node(void *baton, scratch_pool, iterpool)); if (!mn->local_relpath) - svn_sort__array_delete(moved_nodes, i--, 1); + SVN_ERR(svn_sort__array_delete2(moved_nodes, i--, 1)); } } @@ -10804,7 +10804,7 @@ db_read_inherited_props(apr_array_header_t **inherited_props, iprop_elt->prop_hash = node_props; /* Build the output array in depth-first order. */ - svn_sort__array_insert(iprops, &iprop_elt, 0); + SVN_ERR(svn_sort__array_insert2(iprops, &iprop_elt, 0)); } } } @@ -10840,7 +10840,7 @@ db_read_inherited_props(apr_array_header_t **inherited_props, /* If we didn't filter everything then keep this iprop. */ if (apr_hash_count(cached_iprop->prop_hash)) - svn_sort__array_insert(iprops, &cached_iprop, 0); + SVN_ERR(svn_sort__array_insert2(iprops, &cached_iprop, 0)); } } @@ -16616,7 +16616,7 @@ svn_wc__db_find_repos_node_in_wc(apr_array_header_t **local_abspath_list, SVN_ERR(svn_sqlite__step(&have_row, stmt)); } - + return svn_error_trace(svn_sqlite__reset(stmt)); } |