subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1241490 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
Date Tue, 07 Feb 2012 15:42:35 GMT
Author: stsp
Date: Tue Feb  7 15:42:35 2012
New Revision: 1241490

URL: http://svn.apache.org/viewvc?rev=1241490&view=rev
Log:
On the moves-scan-log branch:

* subversion/libsvn_wc/update_editor.c
  (delete_entry): Invoke the conflict callback again after determining
   details of an "incoming move vs. locale move/delete' conflict,
   instead of falling out of the conflict callback loop prematurely.
   While here, mark another spot where we deliberately return to the
   callback with a comment.

Modified:
    subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c

Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c?rev=1241490&r1=1241489&r2=1241490&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c Tue Feb  7 15:42:35
2012
@@ -2158,6 +2158,8 @@ delete_entry(const char *path,
                   /* Assume an incoming move vs. local delete/move conflict. */
                   tree_conflict->action = svn_wc_conflict_action_move_away;
                 }
+
+              /* Return to the conflict callback. */
               continue;
             }
 
@@ -2192,13 +2194,11 @@ delete_entry(const char *path,
 
                   /* Incoming move vs. local move tree conflict. */
                   tree_conflict->action = svn_wc_conflict_action_move_away;
-                  break;
                 }
               else if (tree_conflict->reason == svn_wc_conflict_reason_deleted)
                 {
                   /* Incoming move vs. local delete tree conflict. */
                   tree_conflict->action = svn_wc_conflict_action_move_away;
-                  break;
                 }
 
               /* Now that the precise nature of the conflict is known, invoke



Mime
View raw message