subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1445933 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Wed, 13 Feb 2013 21:22:43 GMT
Author: julianfoad
Date: Wed Feb 13 21:22:43 2013
New Revision: 1445933

URL: http://svn.apache.org/r1445933
Log:
Fix up interactions between conflicts, sleep-for-timestamps, and reporting
other errors, following r1445761.

* subversion/libsvn_client/merge.c
  (merge_locked, merge_reintegrate_locked, do_automatic_merge_locked): Use a
    consistent source code style.
  (merge_peg_locked): Do things in a correct and consistent order: if there
    are conflicts we still need to sleep for timestamps and report any
    'real' error.

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=1445933&r1=1445932&r2=1445933&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb 13 21:22:43 2013
@@ -10286,9 +10286,7 @@ merge_locked(const char *source1,
           if (use_sleep)
             svn_io_sleep_for_timestamps(target->abspath, scratch_pool);
 
-          if (err)
-              return svn_error_trace(err);
-
+          SVN_ERR(err);
           SVN_ERR(make_merge_conflict_error(
                     conflict_report, target->abspath, scratch_pool));
 
@@ -10321,8 +10319,7 @@ merge_locked(const char *source1,
   if (use_sleep)
     svn_io_sleep_for_timestamps(target->abspath, scratch_pool);
 
-  if (err)
-    return svn_error_trace(err);
+  SVN_ERR(err);
 
   SVN_ERR(make_merge_conflict_error(
             conflict_report, target->abspath, scratch_pool));
@@ -11481,8 +11478,7 @@ merge_reintegrate_locked(const char *sou
   if (use_sleep)
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
-  if (err)
-    return svn_error_trace(err);
+  SVN_ERR(err);
   SVN_ERR(make_merge_conflict_error(
             conflict_report, target->abspath, scratch_pool));
 
@@ -11582,16 +11578,18 @@ merge_peg_locked(const char *source_path
                  diff_ignore_ancestry, force_delete, dry_run,
                  record_only, NULL, FALSE, FALSE, depth, merge_options,
                  ctx, sesspool, sesspool);
-  SVN_ERR(make_merge_conflict_error(
-            conflict_report, target->abspath, scratch_pool));
+
+  /* We're done with our RA session. */
+  svn_pool_destroy(sesspool);
 
   if (use_sleep)
     svn_io_sleep_for_timestamps(target_abspath, sesspool);
 
-  /* We're done with our RA session. */
-  svn_pool_destroy(sesspool);
+  SVN_ERR(err);
+  SVN_ERR(make_merge_conflict_error(
+            conflict_report, target->abspath, scratch_pool));
 
-  return svn_error_trace(err);
+  return SVN_NO_ERROR;
 }
 
 svn_error_t *
@@ -12311,7 +12309,6 @@ do_automatic_merge_locked(const svn_clie
     svn_io_sleep_for_timestamps(target_abspath, scratch_pool);
 
   SVN_ERR(err);
-
   SVN_ERR(make_merge_conflict_error(
             conflict_report, target->abspath, scratch_pool));
 



Mime
View raw message