Author: julianfoad Date: Mon Aug 22 11:45:00 2011 New Revision: 1160217 URL: http://svn.apache.org/viewvc?rev=1160217&view=rev Log: Add comments noting some bugs in diff.
* subversion/include/svn_client.h (svn_client_diff5): Note bugs with the 'show_copies_as_adds' option. * subversion/libsvn_client/diff.c (do_diff): Note that the 'show_copies_as_adds' option is being ignored for a repos-repos diff. Modified: subversion/trunk/subversion/include/svn_client.h subversion/trunk/subversion/libsvn_client/diff.c Modified: subversion/trunk/subversion/include/svn_client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1160217&r1=1160216&r2=1160217&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_client.h (original) +++ subversion/trunk/subversion/include/svn_client.h Mon Aug 22 11:45:00 2011 @@ -2776,6 +2776,10 @@ svn_client_blame(const char *path_or_url * If @a show_copies_as_adds is TRUE, then copied files will not be diffed * against their copyfrom source, and will appear in the diff output * in their entirety, as if they were newly added. + * ### BUGS: For a repos-repos diff, this is ignored. Instead, a file is + * diffed against its copyfrom source iff the file is the diff target + * and not if some parent directory is the diff target. For a repos-WC + * diff, this is ignored if the file is the diff target. * * If @a use_git_diff_format is TRUE, then the git's extended diff format * will be used. Modified: subversion/trunk/subversion/libsvn_client/diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1160217&r1=1160216&r2=1160217&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/diff.c (original) +++ subversion/trunk/subversion/libsvn_client/diff.c Mon Aug 22 11:45:00 2011 @@ -1971,6 +1971,7 @@ do_diff(const svn_wc_diff_callbacks4_t * { if (is_repos2) { + /* ### Ignores 'show_copies_as_adds'. */ SVN_ERR(diff_repos_repos(callbacks, callback_baton, ctx, path1, path2, revision1, revision2, peg_revision, depth, ignore_ancestry,