diff options
| author | svnmir <svnmir@FreeBSD.org> | 2015-08-09 04:37:48 +0000 |
|---|---|---|
| committer | svnmir <svnmir@FreeBSD.org> | 2015-08-09 04:37:48 +0000 |
| commit | 91308aec6ca93cab82659cd43b3f6a83d366350b (patch) | |
| tree | 78a13bd0acf7405df6eb6ca94a4e354d124065a6 /subversion/libsvn_wc/update_editor.c | |
| parent | 0d1e05fe9c6027aaf742eb9b8b05f4dbefb92e2e (diff) | |
| download | FreeBSD-src-91308aec6ca93cab82659cd43b3f6a83d366350b.zip FreeBSD-src-91308aec6ca93cab82659cd43b3f6a83d366350b.tar.gz | |
Vendor import subversion-1.8.14
Diffstat (limited to 'subversion/libsvn_wc/update_editor.c')
| -rw-r--r-- | subversion/libsvn_wc/update_editor.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/subversion/libsvn_wc/update_editor.c b/subversion/libsvn_wc/update_editor.c index e02dc30..fd3e9ca 100644 --- a/subversion/libsvn_wc/update_editor.c +++ b/subversion/libsvn_wc/update_editor.c @@ -2125,13 +2125,12 @@ add_directory(const char *path, if (tree_conflict) { svn_wc_conflict_reason_t reason; + const char *move_src_op_root_abspath; /* So this deletion wasn't just a deletion, it is actually a replacement. Let's install a better tree conflict. */ - /* ### Should store the conflict in DB to allow reinstalling - ### with theoretically more data in close_directory() */ - - SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, + SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, + &move_src_op_root_abspath, eb->db, db->local_abspath, tree_conflict, @@ -2143,7 +2142,7 @@ add_directory(const char *path, tree_conflict, eb->db, db->local_abspath, reason, svn_wc_conflict_action_replace, - NULL, + move_src_op_root_abspath, db->pool, db->pool)); /* And now stop checking for conflicts here and just perform @@ -3266,13 +3265,12 @@ add_file(const char *path, if (tree_conflict) { svn_wc_conflict_reason_t reason; + const char *move_src_op_root_abspath; /* So this deletion wasn't just a deletion, it is actually a replacement. Let's install a better tree conflict. */ - /* ### Should store the conflict in DB to allow reinstalling - ### with theoretically more data in close_directory() */ - - SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, NULL, + SVN_ERR(svn_wc__conflict_read_tree_conflict(&reason, NULL, + &move_src_op_root_abspath, eb->db, fb->local_abspath, tree_conflict, @@ -3284,7 +3282,7 @@ add_file(const char *path, tree_conflict, eb->db, fb->local_abspath, reason, svn_wc_conflict_action_replace, - NULL, + move_src_op_root_abspath, fb->pool, fb->pool)); /* And now stop checking for conflicts here and just perform @@ -5553,8 +5551,8 @@ svn_wc__complete_directory_add(svn_wc_context_t *wc_ctx, original_repos_relpath, original_root_url, original_uuid, original_revision, NULL /* children */, - FALSE /* is_move */, svn_depth_infinity, + FALSE /* is_move */, NULL /* conflict */, NULL /* work_items */, scratch_pool)); |
