subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1443035 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Wed, 06 Feb 2013 15:58:48 GMT
Author: rhuijben
Date: Wed Feb  6 15:58:48 2013
New Revision: 1443035

URL: http://svn.apache.org/viewvc?rev=1443035&view=rev
Log:
* subversion/libsvn_client/merge.c
  (drive_merge_report_editor): Following up on r1443032, remove the other
    unneeded setter of use_sleep.

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=1443035&r1=1443034&r2=1443035&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb  6 15:58:48 2013
@@ -5459,9 +5459,6 @@ drive_merge_report_editor(const char *ta
   SVN_ERR(svn_ra_reparent(merge_b->ra_session1, old_sess1_url, scratch_pool));
   SVN_ERR(svn_ra_reparent(merge_b->ra_session2, old_sess2_url, scratch_pool));
 
-  /* Caller must call svn_sleep_for_timestamps() */
-  *(merge_b->use_sleep) = TRUE;
-
   return SVN_NO_ERROR;
 }
 



Mime
View raw message