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

Thinko in libsvn_client/merge.c?

From: Roderich Schupp <roderich.schupp_at_googlemail.com>
Date: Tue, 13 Apr 2010 11:14:59 +0200


while looking at calls of svn_client__open_ra_session_internal (to check for
unnecessarily opening a session in the repository root) I stumbled about
the following (first few lines of function merge_reintegrate_locked
in libsvn_client/merge.c):

static svn_error_t *
merge_reintegrate_locked(const char *source,
                         const svn_opt_revision_t *peg_revision,
                         const char *target_abspath,
                         svn_boolean_t dry_run,
                         const apr_array_header_t *merge_options,
                         svn_client_ctx_t *ctx,
                         apr_pool_t *scratch_pool)
  /* Make sure we're dealing with a real URL. */
  SVN_ERR(svn_client_url_from_path2(&url2, source, ctx,
                                    scratch_pool, scratch_pool));
  if (! url2)
    return svn_error_createf(SVN_ERR_ENTRY_MISSING_URL, NULL,
                             _("'%s' has no URL"),
                             svn_dirent_local_style(source, scratch_pool));

  /* Determine the working copy target's repository root URL. */
  working_revision.kind = svn_opt_revision_working;
  SVN_ERR(svn_client__get_repos_root(&wc_repos_root, target_abspath,
                                     &working_revision, ctx,
                                     scratch_pool, scratch_pool));

  /* Open an RA session to our source URL, and determine its root URL. */
wc_repos_root, <========
                                               NULL, NULL,
                                               FALSE, FALSE, ctx,
  SVN_ERR(svn_ra_get_repos_root2(ra_session, &source_repos_root, scratch_pool));

  /* source_repos_root and wc_repos_root are required to be the same,
     as mergeinfo doesn't come into play for cross-repository merging. */
  if (strcmp(source_repos_root, wc_repos_root) != 0)
    return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
                             _("'%s' must be from the same repository as "

My gripe is with the line marked <===== and the check at the end of the snippet:
If we go from working copy (target_abspath) to its repos_root (wc_repos_root),
then open a session there and then ask that for the repos_root
the two *repos_roots should be the same by construction, hence the
check is bogus.

However, it would make sense if "wc_repos_root" in <==== was a thinko and
"url2" was actually intended. Then also the comment above <===== would make
sense, because url2 is the URL form of "source".

Cheers, Roderich
Received on 2010-04-13 11:15:31 CEST

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