svn commit: r1727717 - /subversion/trunk/subversion/libsvn_fs_x/changes.c

[stefan2]

Author: stefan2
Date: Sat Jan 30 15:41:57 2016
New Revision: 1727717

URL: http://svn.apache.org/viewvc?rev=1727717&view=rev
Log:
Add support for the mergeinfo_mod flag to FSX changed paths list containers.
This had been omitted by accident.

* subversion/libsvn_fs_x/changes.c
  (CHANGE_MERGEINFO_MOD): Define bit we use to represent the flag.
  (append_change): Store the new flag.
  (svn_fs_x__changes_get_list): Return the new flag.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/changes.c

Modified: subversion/trunk/subversion/libsvn_fs_x/changes.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/changes.c?rev=1727717&r1=1727716&r2=1727717&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/changes.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/changes.c Sat Jan 30 15:41:57 2016
@@ -37,6 +37,9 @@
 /* the change contains a property modification */
 #define CHANGE_PROP_MOD     0x00002
 
+/* the change contains a mergeinfo modification */
+#define CHANGE_MERGEINFO_MOD 0x00004
+
 /* (flags & CHANGE_NODE_MASK) >> CHANGE_NODE_SHIFT extracts the node type */
 #define CHANGE_NODE_SHIFT   0x00003
 #define CHANGE_NODE_MASK    0x00018
@@ -139,6 +142,8 @@ append_change(svn_fs_x__changes_t *chang
   /* define the kind of change and what specific information is present */
   binary_change.flags = (change->text_mod ? CHANGE_TEXT_MOD : 0)
                       | (change->prop_mod ? CHANGE_PROP_MOD : 0)
+                      | (change->mergeinfo_mod == svn_tristate_true
+                                          ? CHANGE_MERGEINFO_MOD : 0)
                       | ((int)change->change_kind << CHANGE_KIND_SHIFT)
                       | ((int)change->node_kind << CHANGE_NODE_SHIFT);
 
@@ -251,6 +256,9 @@ svn_fs_x__changes_get_list(apr_array_hea
         ((binary_change->flags & CHANGE_KIND_MASK) >> CHANGE_KIND_SHIFT);
       change->text_mod = (binary_change->flags & CHANGE_TEXT_MOD) != 0;
       change->prop_mod = (binary_change->flags & CHANGE_PROP_MOD) != 0;
+      change->mergeinfo_mod = (binary_change->flags & CHANGE_MERGEINFO_MOD)
+                            ? svn_tristate_true
+                            : svn_tristate_false;
       change->node_kind = (svn_node_kind_t)
         ((binary_change->flags & CHANGE_NODE_MASK) >> CHANGE_NODE_SHIFT);