You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2013/02/06 18:03:54 UTC

svn commit: r1443070 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: pburba
Date: Wed Feb  6 17:03:54 2013
New Revision: 1443070

URL: http://svn.apache.org/viewvc?rev=1443070&view=rev
Log:
Follow-up to r1443040, reuse a session.

* subversion/libsvn_client/merge.c
  (do_automatic_merge_locked): Pass the session we open to normalize merge
   sources to do_merge().


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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1443070&r1=1443069&r2=1443070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb  6 17:03:54 2013
@@ -12030,7 +12030,7 @@ do_automatic_merge_locked(const svn_clie
                                   scratch_pool),
         ra_session, ctx, scratch_pool, scratch_pool));
 
-      err = do_merge(NULL, NULL, merge_sources, target, NULL,
+      err = do_merge(NULL, NULL, merge_sources, target, ra_session,
                      TRUE /*related*/, TRUE /*same_repos*/,
                      FALSE /*ignore_mergeinfo*/, diff_ignore_ancestry,
                      force_delete, dry_run,