subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1683813 - /subversion/branches/move-tracking-2/subversion/libsvn_client/update.c
Date Fri, 05 Jun 2015 17:18:26 GMT
Author: julianfoad
Date: Fri Jun  5 17:18:25 2015
New Revision: 1683813

URL: http://svn.apache.org/r1683813
Log:
On the 'move-tracking-2' branch: Improve the log-scanning move detection by
recognizing the 'replace' log action.

* subversion/libsvn_client/update.c
  (scan_moves_log_receiver): Detect the 'replace' action, treating it as a
    delete and an add.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_client/update.c

Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/update.c?rev=1683813&r1=1683812&r2=1683813&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/update.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/update.c Fri Jun  5 17:18:25
2015
@@ -425,7 +425,7 @@ scan_moves_log_receiver(void *baton,
       const char *path = apr_hash_this_key(hi);
       svn_log_changed_path2_t *data = apr_hash_this_val(hi);
 
-      if (data->action == 'A' && data->copyfrom_path)
+      if ((data->action == 'A' || data->action == 'R') && data->copyfrom_path)
         {
           struct copy_info *copy;
           apr_array_header_t *copies_with_same_source_path;
@@ -453,7 +453,8 @@ scan_moves_log_receiver(void *baton,
           APR_ARRAY_PUSH(copies_with_same_source_path,
                          struct copy_info *) = copy;
         }
-      else if (data->action == 'D')
+
+      if (data->action == 'D' || data->action == 'R')
         {
           const char *parent_path;
 



Mime
View raw message