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/10/25 19:08:04 UTC
svn commit: r1766582 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Tue Oct 25 19:08:04 2016
New Revision: 1766582
URL: http://svn.apache.org/viewvc?rev=1766582&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(diff_file_added): Fix file existence check. It was testing the same
variable twice but should check two different ones instead.
Found by: jamessan
(with Coverity)
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=1766582&r1=1766581&r2=1766582&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Oct 25 19:08:04 2016
@@ -5898,7 +5898,7 @@ diff_file_added(const char *relpath,
FALSE, FALSE, scratch_pool));
SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
- if (db_kind == svn_node_file && db_kind == svn_node_file)
+ if (db_kind == svn_node_file && on_disk_kind == svn_node_file)
{
propsarray = svn_prop_hash_to_array(right_props, scratch_pool);
SVN_ERR(svn_categorize_props(propsarray, NULL, NULL, ®ular_props,