You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/08/01 16:12:33 UTC
svn commit: r981230 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: rhuijben
Date: Sun Aug 1 14:12:33 2010
New Revision: 981230
URL: http://svn.apache.org/viewvc?rev=981230&view=rev
Log:
Use a string comparison instead of a pointer comparision, because
convert_to_url() alsways duplicates its output arguments since r878881
(aka r38807)
* subversion/libsvn_client/diff.c
(diff_prepare_repos_repos): Following up on r878881, use strcmp() instead of
pointer compare.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=981230&r1=981229&r2=981230&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sun Aug 1 14:12:33 2010
@@ -1412,7 +1412,7 @@ diff_prepare_repos_repos(const struct di
/* Do the same for the first target. */
SVN_ERR(svn_ra_reparent(ra_session, drr->url1, pool));
SVN_ERR(svn_client__get_revision_number(&drr->rev1, NULL, ctx->wc_ctx,
- (params->path1 == drr->url1) ? NULL : params_path1_abspath,
+ (strcmp(params->path1, drr->url1) == 0) ? NULL : params_path1_abspath,
ra_session, params->revision1, pool));
SVN_ERR(svn_ra_check_path(ra_session, "", drr->rev1, &kind1, pool));
if (kind1 == svn_node_none)
@@ -1735,7 +1735,7 @@ diff_repos_wc(const char *path1,
/* Tell the RA layer we want a delta to change our txn to URL1 */
SVN_ERR(svn_client__get_revision_number(&rev, NULL, ctx->wc_ctx,
- (path1 == url1) ? NULL : abspath1,
+ (strcmp(path1, url1) == 0) ? NULL : abspath1,
ra_session, revision1, pool));
if (!reverse)