subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1205914 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
Date Thu, 24 Nov 2011 16:29:11 GMT
Author: stsp
Date: Thu Nov 24 16:29:11 2011
New Revision: 1205914

URL: http://svn.apache.org/viewvc?rev=1205914&view=rev
Log:
On the moves-scan-log branch, always create the suggested_moves array in
tree conflict descriptions, even if it is empty.

* subversion/libsvn_wc/update_editor.c
  (delete_entry): Create an empy array of suggested moves if no moves were
   found scanning the log. This allows the conflict callback to tell wether
   or not a log scan has already happened.

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=1205914&r1=1205913&r2=1205914&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 Thu Nov 24 16:29:11
2011
@@ -2145,12 +2145,9 @@ delete_entry(const char *path,
               SVN_ERR(get_repos_moves(eb, scratch_pool));
               
               /* Find a server-side move which applies to the deleted node. */
-              if (apr_hash_count(eb->repos_moves) > 0)
-                {
-                  SVN_ERR(find_applicable_moves(
-                            &tree_conflict->suggested_moves, eb,
-                            local_abspath, scratch_pool, scratch_pool));
-                }
+              SVN_ERR(find_applicable_moves(
+                        &tree_conflict->suggested_moves, eb,
+                        local_abspath, scratch_pool, scratch_pool));
               continue;
             }
 



Mime
View raw message