subversion-commits mailing list archives

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

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

* subversion/libsvn_wc/update_editor.c
  (delete_entry): Add empty placeholders for the following tree conflict
   resolution cases (none implemented yet):
     o incoming move vs. local move, choose incoming
     o incoming move vs. local move, choose local
     o incoming move vs. local delete, choose incoming
     o incoming move vs. local delete, choose local

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=1241540&r1=1241539&r2=1241540&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 18:21:04
2012
@@ -2275,13 +2275,33 @@ delete_entry(const char *path,
               break;
             }
 
-          if (result->choice == svn_wc_conflict_choose_mine_conflict)
+          if (tree_conflict->reason == svn_wc_conflict_reason_moved_away &&
+              tree_conflict->action == svn_wc_conflict_action_move_away &&
+              result->choice == svn_wc_conflict_choose_mine_conflict)
             {
               /* ### TODO */
               break;
             }
 
-          if (result->choice == svn_wc_conflict_choose_theirs_conflict)
+          if (tree_conflict->reason == svn_wc_conflict_reason_moved_away &&
+              tree_conflict->action == svn_wc_conflict_action_move_away &&
+              result->choice == svn_wc_conflict_choose_theirs_conflict)
+            {
+              /* ### TODO */
+              break;
+            }
+
+          if (tree_conflict->reason == svn_wc_conflict_reason_deleted &&
+              tree_conflict->action == svn_wc_conflict_action_move_away &&
+              result->choice == svn_wc_conflict_choose_mine_conflict)
+            {
+              /* ### TODO */
+              break;
+            }
+
+          if (tree_conflict->reason == svn_wc_conflict_reason_deleted &&
+              tree_conflict->action == svn_wc_conflict_action_move_away &&
+              result->choice == svn_wc_conflict_choose_theirs_conflict)
             {
               /* ### TODO */
               break;



Mime
View raw message