diff options
| author | peter <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
| commit | c18b5d7f26f112be58bb1c4660799dea49f219ba (patch) | |
| tree | 013c2e6845398e5a9ca4901dcc077769c7520e1d /subversion/libsvn_wc/delete.c | |
| parent | 91308aec6ca93cab82659cd43b3f6a83d366350b (diff) | |
| download | FreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.zip FreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.tar.gz | |
Vendor import of subversion-1.9.2
Diffstat (limited to 'subversion/libsvn_wc/delete.c')
| -rw-r--r-- | subversion/libsvn_wc/delete.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/subversion/libsvn_wc/delete.c b/subversion/libsvn_wc/delete.c index 37c8af0..82ae938 100644 --- a/subversion/libsvn_wc/delete.c +++ b/subversion/libsvn_wc/delete.c @@ -135,7 +135,8 @@ create_delete_wq_items(svn_skel_t **work_items, const apr_array_header_t *markers; int i; - SVN_ERR(svn_wc__db_read_conflict(&conflict, db, local_abspath, + SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, NULL, + db, local_abspath, scratch_pool, scratch_pool)); SVN_ERR(svn_wc__conflict_read_markers(&markers, db, local_abspath, @@ -431,9 +432,6 @@ svn_wc__internal_remove_from_revision_control(svn_wc__db_t *db, db, local_abspath, destroy_wf /* destroy_wc */, destroy_wf /* destroy_changes */, - SVN_INVALID_REVNUM, - svn_wc__db_status_not_present, - svn_node_none, NULL, NULL, cancel_func, cancel_baton, scratch_pool)); |
