You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/01/07 16:49:55 UTC
svn commit: r1429857 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: stsp
Date: Mon Jan 7 15:49:55 2013
New Revision: 1429857
URL: http://svn.apache.org/viewvc?rev=1429857&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(check_tree_conflict): Remove unused parameter 'working_kind'.
(delete_entry, add_directory, open_directory, add_file,
open_file): Update callers.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1429857&r1=1429856&r2=1429857&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jan 7 15:49:55 2013
@@ -1346,7 +1346,6 @@ check_tree_conflict(svn_skel_t **pconfli
struct edit_baton *eb,
const char *local_abspath,
svn_wc__db_status_t working_status,
- svn_kind_t working_kind,
svn_boolean_t exists_in_repos,
svn_wc_conflict_action_t action,
apr_pool_t *result_pool,
@@ -1697,7 +1696,7 @@ delete_entry(const char *path,
if (!pb->shadowed)
{
SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath,
- status, kind, TRUE,
+ status, TRUE,
svn_wc_conflict_action_delete,
pb->pool, scratch_pool));
}
@@ -2068,7 +2067,7 @@ add_directory(const char *path,
{
SVN_ERR(check_tree_conflict(&tree_conflict, eb,
db->local_abspath,
- status, wc_kind, FALSE,
+ status, FALSE,
svn_wc_conflict_action_add,
pool, pool));
}
@@ -2251,7 +2250,7 @@ open_directory(const char *path,
* a tree-conflict on a parent node. */
if (!db->shadowed)
SVN_ERR(check_tree_conflict(&tree_conflict, eb, db->local_abspath,
- status, wc_kind, TRUE,
+ status, TRUE,
svn_wc_conflict_action_edit,
db->pool, pool));
@@ -3138,7 +3137,7 @@ add_file(const char *path,
{
SVN_ERR(check_tree_conflict(&tree_conflict, eb,
fb->local_abspath,
- status, wc_kind, FALSE,
+ status, FALSE,
svn_wc_conflict_action_add,
scratch_pool, scratch_pool));
}
@@ -3307,7 +3306,7 @@ open_file(const char *path,
* a tree-conflict on a parent node. */
if (!fb->shadowed)
SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath,
- status, wc_kind, TRUE,
+ status, TRUE,
svn_wc_conflict_action_edit,
fb->pool, scratch_pool));