svn commit: r1661034 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: dag_cache.c tree.c

[stefan2]

Author: stefan2
Date: Thu Feb 19 23:53:46 2015
New Revision: 1661034

URL: http://svn.apache.org/r1661034
Log:
On the fsx-1.10 branch:  Follow-up to r1661031.

* subversion/libsvn_fs_x/dag_cache.c
  (get_copy_inheritance,
   svn_fs_x__make_path_mutable): Revert condition that had been toggled
                                 accidentally.

* subversion/libsvn_fs_x/tree.c
  (merge_changes): Same.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.c?rev=1661034&r1=1661033&r2=1661034&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/dag_cache.c Thu Feb 19 
23:53:46 2015
@@ -830,7 +830,7 @@ get_copy_inheritance(svn_fs_x__copy_id_i
   SVN_ERR(svn_fs_x__get_dag_node(&copyroot_node, copyroot_root,
                                  copyroot_path, pool));
 
-  if (svn_fs_x__dag_related_node(copyroot_node, child->node))
+  if (!svn_fs_x__dag_related_node(copyroot_node, child->node))
     return SVN_NO_ERROR;
 
   /* Determine if we are looking at the child via its original path or
@@ -1080,7 +1080,7 @@ svn_fs_x__make_path_mutable(svn_fs_root_
       SVN_ERR(svn_fs_x__get_dag_node(&copyroot_node, copyroot_root,
                                      copyroot_path, result_pool));
 
-      if (svn_fs_x__dag_related_node(copyroot_node, parent_path->node))
+      if (!svn_fs_x__dag_related_node(copyroot_node, parent_path->node))
         is_parent_copyroot = TRUE;
 
       /* Now make this node mutable.  */

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c?rev=1661034&r1=1661033&r2=1661034&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c Thu Feb 19 
23:53:46 2015
@@ -1104,7 +1104,7 @@ merge_changes(dag_node_t *ancestor_node,
                                           scratch_pool, scratch_pool));
     }
 
-  if (svn_fs_x__dag_related_node(ancestor_node, txn_root_node))
+  if (!svn_fs_x__dag_related_node(ancestor_node, txn_root_node))
     {
       /* If no changes have been made in TXN since its current base,
          then it can't conflict with any changes since that base.