svn commit: r1595600 - in /subversion/trunk/subversion/libsvn_fs_x: ./ transaction.c

[st...@apache.org]

Author: stefan2
Date: Sun May 18 11:50:32 2014
New Revision: 1595600

URL: http://svn.apache.org/r1595600
Log:
Sync'ing FSX with FSFS:
Merge r1525419,1525484,1526014 and 1532893 from /subversion/libsvn_fs_fs
into subversion/libsvn_fs_x.  The first 3 are no-ops has the respective
code had been ported earlier.

This ports the move-handling patches.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/   (props changed)
    subversion/trunk/subversion/libsvn_fs_x/transaction.c

Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
  Merged /subversion/trunk/subversion/libsvn_fs_fs:r1525419,1525484,1526014,1532893

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1595600&r1=1595599&r2=1595600&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Sun May 18 11:50:32 2014
@@ -949,7 +949,8 @@ fold_change(apr_hash_t *changes,
 
       /* Sanity check: an add can't follow anything except
          a delete or reset.  */
-      if ((info->change_kind == svn_fs_path_change_add)
+      if ((   (info->change_kind == svn_fs_path_change_add)
+           || (info->change_kind == svn_fs_path_change_move))
           && (old_change->change_kind != svn_fs_path_change_delete)
           && (old_change->change_kind != svn_fs_path_change_reset))
         return svn_error_create
@@ -3004,7 +3005,8 @@ write_final_changed_path_info(apr_off_t 
       svn_fs_path_change2_t *change;
       apr_hash_this(hi, NULL, NULL, (void **)&change);
 
-      if (change->change_kind == svn_fs_path_change_move)
+      if (   (change->change_kind == svn_fs_path_change_move)
+          || (change->change_kind == svn_fs_path_change_movereplace))
         change->copyfrom_rev = new_rev - 1;
     }