subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1445417 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 12 Feb 2013 22:30:15 GMT
Author: julianfoad
Date: Tue Feb 12 22:30:14 2013
New Revision: 1445417

URL: http://svn.apache.org/r1445417
Log:
* subversion/libsvn_client/merge.c
  (merge_locked): Clean up the clean-up code after a 2-URL merge so that we
    always sleep for time stamps if needed and always clear the session pool.

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=1445417&r1=1445416&r2=1445417&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Feb 12 22:30:14 2013
@@ -10187,19 +10187,17 @@ merge_locked(const char *source1,
                                                        merge_options,
                                                        &use_sleep, ctx,
                                                        scratch_pool);
-          if (err)
-            {
-              if (use_sleep)
-                svn_io_sleep_for_timestamps(target->abspath, scratch_pool);
-
-              return svn_error_trace(err);
-            }
-
           /* Close our temporary RA sessions (this could've happened
              after the second call to normalize_merge_sources() inside
              the merge_cousins_and_supplement_mergeinfo() routine). */
           svn_pool_destroy(sesspool);
 
+          if (use_sleep)
+            svn_io_sleep_for_timestamps(target->abspath, scratch_pool);
+
+          if (err)
+              return svn_error_trace(err);
+
           return SVN_NO_ERROR;
         }
     }



Mime
View raw message