[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1764447 - in /subversion/trunk/subversion: libsvn_client/conflicts.c tests/libsvn_client/conflicts-test.c

From: James McCoy <jamessan_at_jamessan.com>
Date: Sun, 23 Oct 2016 15:31:22 -0400

On Wed, Oct 12, 2016 at 12:34:19PM -0000, stsp_at_apache.org wrote:
> Author: stsp
> Date: Wed Oct 12 12:34:18 2016
> New Revision: 1764447
>
> URL: http://svn.apache.org/viewvc?rev=1764447&view=rev
> Log:
> Don't flag an unnecessary tree conflict while resolving 'add vs add'.
>
> * subversion/libsvn_client/conflicts.c
> (merge_added_files): New helper function.
> (diff_file_added): If a file already exists then just merge with the
> incoming file and return.
>
> * subversion/tests/libsvn_client/conflicts-test.c
> (test_merge_incoming_added_dir_merge, test_merge_incoming_added_dir_merge2,
> test_merge_incoming_added_dir_merge3): Adjust test expectations accordingly.
>
>
>
> Modified:
> subversion/trunk/subversion/libsvn_client/conflicts.c
> subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
>
> 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?

Cheers,

-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB
Received on 2016-10-23 21:31:35 CEST

This is an archived mail posted to the Subversion Dev mailing list.