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 2016/06/10 15:11:21 UTC
svn commit: r1747729 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Fri Jun 10 15:11:21 2016
New Revision: 1747729
URL: http://svn.apache.org/viewvc?rev=1747729&view=rev
Log:
Fix some small coding style issues in the conflict resolver.
* subversion/libsvn_client/conflicts.c
(describe_incoming_add_upon_update): Add curly braces for clarity.
(describe_incoming_add_upon_update,
(describe_incoming_add_upon_switch,
(describe_incoming_add_upon_merge,
(describe_incoming_reverse_deletion_upon_merge): Remove pointless 'return'
statements which are never reached and return a value of the wrong type.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1747729&r1=1747728&r2=1747729&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Jun 10 15:11:21 2016
@@ -3358,6 +3358,7 @@ describe_incoming_add_upon_update(
}
else if (new_node_kind == svn_node_file ||
new_node_kind == svn_node_symlink)
+ {
if (SVN_IS_VALID_REVNUM(details->added_rev) &&
SVN_IS_VALID_REVNUM(details->deleted_rev))
return apr_psprintf(result_pool,
@@ -3376,7 +3377,9 @@ describe_incoming_add_upon_update(
_("A new file appeared during update to r%ld; "
"it was deleted by %s in r%ld."), new_rev,
details->deleted_rev_author, details->deleted_rev);
+ }
else
+ {
if (SVN_IS_VALID_REVNUM(details->added_rev) &&
SVN_IS_VALID_REVNUM(details->deleted_rev))
return apr_psprintf(result_pool,
@@ -3395,8 +3398,7 @@ describe_incoming_add_upon_update(
_("A new item appeared during update to r%ld; "
"it was deleted by %s in r%ld."), new_rev,
details->deleted_rev_author, details->deleted_rev);
-
- return SVN_NO_ERROR;
+ }
}
static const char *
@@ -3484,7 +3486,6 @@ describe_incoming_add_upon_switch(
new_repos_relpath, new_rev,
details->deleted_rev_author, details->deleted_rev);
}
- return SVN_NO_ERROR;
}
static const char *
@@ -3542,7 +3543,6 @@ describe_incoming_add_upon_merge(
new_repos_relpath, old_rev + 1, new_rev,
details->added_rev_author, details->added_rev);
}
- return SVN_NO_ERROR;
}
static const char *
@@ -3607,8 +3607,6 @@ describe_incoming_reverse_deletion_upon_
details->deleted_rev_author,
details->deleted_rev);
}
-
- return SVN_NO_ERROR;
}
/* Implements tree_conflict_get_description_func_t. */