subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1870784 - in /subversion/branches/1.11.x: ./ STATUS subversion/libsvn_client/conflicts.c
Date Wed, 04 Dec 2019 04:00:16 GMT
Author: svn-role
Date: Wed Dec  4 04:00:16 2019
New Revision: 1870784

URL: http://svn.apache.org/viewvc?rev=1870784&view=rev
Log:
Merge r1851903 from trunk:

 * r1851903
   Fix missing unlock of working copy in a resolver error case.
   Justification:
     Could force users to run 'svn cleanup' unnecessarily.
   Votes:
     +1: stsp, rhuijben, jamessan

Modified:
    subversion/branches/1.11.x/   (props changed)
    subversion/branches/1.11.x/STATUS
    subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c

Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1851903

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870784&r1=1870783&r2=1870784&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Dec  4 04:00:16 2019
@@ -56,17 +56,9 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1851903
-   Fix missing unlock of working copy in a resolver error case.
-   Justification:
-     Could force users to run 'svn cleanup' unnecessarily.
-   Votes:
-     +1: stsp, rhuijben, jamessan
-
  * r1853450
    Enable 'incoming_move_file_merge' option only if local change is file edit.
    Justification:
      Conflict resolver misbehaves when it runs into move vs move conflicts.
    Votes:
      +1: stsp, rhuijben, jamessan
-

Modified: subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c?rev=1870784&r1=1870783&r2=1870784&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/1.11.x/subversion/libsvn_client/conflicts.c Wed Dec  4 04:00:16 2019
@@ -9012,12 +9012,14 @@ resolve_incoming_move_dir_merge(svn_clie
       svn_opt_revision_t incoming_new_opt_rev;
 
       /* Revert the incoming move target directory. */
-      SVN_ERR(svn_wc_revert6(ctx->wc_ctx, moved_to_abspath, svn_depth_infinity,
-                             FALSE, NULL, TRUE, FALSE,
-                             TRUE /*added_keep_local*/,
-                             NULL, NULL, /* no cancellation */
-                             ctx->notify_func2, ctx->notify_baton2,
-                             scratch_pool));
+      err = svn_wc_revert6(ctx->wc_ctx, moved_to_abspath, svn_depth_infinity,
+                           FALSE, NULL, TRUE, FALSE,
+                           TRUE /*added_keep_local*/,
+                           NULL, NULL, /* no cancellation */
+                           ctx->notify_func2, ctx->notify_baton2,
+                           scratch_pool);
+      if (err)
+        goto unlock_wc;
 
       /* The move operation is not part of natural history. We must replicate
        * this move in our history. Record a move in the working copy. */



Mime
View raw message