You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2010/08/12 14:58:19 UTC
svn commit: r984751 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: neels
Date: Thu Aug 12 12:58:18 2010
New Revision: 984751
URL: http://svn.apache.org/viewvc?rev=984751&view=rev
Log:
* subversion/libsvn_wc/update_editor.c (add_file): Cosmetic.
ERR is usually the last variable declared. Have separate lines for
two other var declarations.
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=984751&r1=984750&r2=984751&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Aug 12 12:58:18 2010
@@ -3750,8 +3750,8 @@ add_file(const char *path,
apr_pool_t *subpool;
svn_boolean_t conflicted;
svn_boolean_t versioned_locally_and_present;
- svn_error_t *err;
svn_wc_conflict_description2_t *tree_conflict = NULL;
+ svn_error_t *err;
/* Semantic check. Either both "copyfrom" args are valid, or they're
NULL and SVN_INVALID_REVNUM. A mixture is illegal semantics. */
@@ -3912,7 +3912,8 @@ add_file(const char *path,
if (local_is_file)
{
- svn_boolean_t wc_root, switched;
+ svn_boolean_t wc_root;
+ svn_boolean_t switched;
SVN_ERR(svn_wc__check_wc_root(&wc_root, NULL, &switched,
eb->db, fb->local_abspath, pool));