svn commit: r1392891 - /subversion/trunk/subversion/libsvn_client/commit.c

[st...@apache.org]

Author: stsp
Date: Tue Oct  2 12:36:54 2012
New Revision: 1392891

URL: http://svn.apache.org/viewvc?rev=1392891&view=rev
Log:
Follow-up to r1392877:

* subversion/libsvn_client/commit.c
  (svn_client_commit6): Get rid of a useless local variable and tweak comment.

Modified:
    subversion/trunk/subversion/libsvn_client/commit.c

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1392891&r1=1392890&r2=1392891&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Tue Oct  2 12:36:54 2012
@@ -1441,7 +1441,6 @@ svn_client_commit6(const apr_array_heade
   const char *log_msg;
   const char *base_abspath;
   const char *base_url;
-  const char *ra_session_wc;
   apr_array_header_t *rel_targets;
   apr_array_header_t *lock_targets;
   apr_array_header_t *locks_obtained;
@@ -1771,14 +1770,16 @@ svn_client_commit6(const apr_array_heade
   cb.info = &commit_info;
   cb.pool = pool;
 
-  /* Get the RA editor from the first WC.  We don't support commits to
-   * multiple repositories so using the first WC to get the RA session
-   * is safe. */
-  ra_session_wc = APR_ARRAY_IDX(lock_targets, 0, const char *);
-
+  /* Get the RA editor from the first lock target, rather than BASE_ABSPATH.
+   * When committing from multiple WCs, BASE_ABSPATH might be an unrelated
+   * parent of nested working copies. We don't support commits to multiple
+   * repositories so using the first WC to get the RA session is safe. */
   cmt_err = svn_error_trace(
               svn_client__open_ra_session_internal(&ra_session, NULL, base_url,
-                                                   ra_session_wc, commit_items,
+                                                   APR_ARRAY_IDX(lock_targets,
+                                                                 0,
+                                                                 const char *),
+                                                   commit_items,
                                                    TRUE, FALSE, ctx, pool));
 
   if (cmt_err)