svn commit: r1555508 - in /subversion/branches/1.7.x-r1555491: ./ subversion/libsvn_fs_fs/tree.c

[stefan2]

Author: stefan2
Date: Sun Jan  5 14:02:20 2014
New Revision: 1555508

URL: http://svn.apache.org/r1555508
Log:
Merged r1555491 from /trunk and resolved a minor conflict.

Modified:
    subversion/branches/1.7.x-r1555491/   (props changed)
    subversion/branches/1.7.x-r1555491/subversion/libsvn_fs_fs/tree.c

Propchange: subversion/branches/1.7.x-r1555491/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1555491

Modified: subversion/branches/1.7.x-r1555491/subversion/libsvn_fs_fs/tree.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1555491/subversion/libsvn_fs_fs/tree.c?rev=1555508&r1=1555507&r2=1555508&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1555491/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/1.7.x-r1555491/subversion/libsvn_fs_fs/tree.c Sun Jan  
5 14:02:20 2014
@@ -3835,7 +3835,7 @@ make_txn_root(svn_fs_root_t **root_p,
 
      Note that we cannot put those caches in frd because that content
      fs root object is not available where we would need it. */
-  SVN_ERR(svn_fs_fs__initialize_txn_caches(fs, txn, pool));
+  SVN_ERR(svn_fs_fs__initialize_txn_caches(fs, txn, root->pool));
 
   root->fsap_data = frd;