On Sun, Oct 23, 2016 at 03:31:22PM -0400, James McCoy wrote: > On Wed, Oct 12, 2016 at 12:34:19PM -0000, s...@apache.org wrote: > > Modified: subversion/trunk/subversion/libsvn_client/conflicts.c > > URL: > > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1764447&r1=1764446&r2=1764447&view=diff > > ============================================================================== > > --- subversion/trunk/subversion/libsvn_client/conflicts.c (original) > > +++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Oct 12 > > 12:34:18 2016 > > @@ -5666,6 +5726,18 @@ 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) > > Coverity noticed both sides of the && are the same. Should one side be > "on_disk_kind == svn_node_file" instead? >
Yes indeed, it should. Thanks! I'll fix this when I find time if it's not already been fixed by then. > Cheers, > -- > James > GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB
