Index: subversion/libsvn_fs_fs/tree.c =================================================================== --- subversion/libsvn_fs_fs/tree.c (revision 26949) +++ subversion/libsvn_fs_fs/tree.c (working copy) @@ -1133,7 +1133,6 @@ update_ancestry(svn_fs_t *fs, const svn_fs_id_t *source_id, const svn_fs_id_t *target_id, - const char *txn_id, const char *target_path, int source_pred_count, apr_pool_t *pool) @@ -1494,7 +1493,7 @@ svn_pool_destroy(iterpool); SVN_ERR(svn_fs_fs__dag_get_predecessor_count(&pred_count, source, pool)); - SVN_ERR(update_ancestry(fs, source_id, target_id, txn_id, target_path, + SVN_ERR(update_ancestry(fs, source_id, target_id, target_path, pred_count, pool)); return SVN_NO_ERROR; @@ -2306,7 +2305,7 @@ SVN_ERR(svn_stream_close(tb->target_stream)); SVN_ERR(svn_fs_fs__dag_finalize_edits(tb->node, tb->result_checksum, - tb->root->txn, tb->pool)); + tb->pool)); } return SVN_NO_ERROR; @@ -2489,7 +2488,7 @@ /* Need to tell fs that we're done sending text */ SVN_ERR(svn_fs_fs__dag_finalize_edits(tb->node, tb->result_checksum, - tb->root->txn, tb->pool)); + tb->pool)); return SVN_NO_ERROR; } Index: subversion/libsvn_fs_fs/dag.h =================================================================== --- subversion/libsvn_fs_fs/dag.h (revision 26949) +++ subversion/libsvn_fs_fs/dag.h (working copy) @@ -331,7 +331,6 @@ /* Signify the completion of edits to FILE made using the stream returned by svn_fs_fs__dag_get_edit_stream, allocating from POOL. - TXN_ID is the Subversion transaction under which this occurs. If CHECKSUM is non-null, it must match the checksum for FILE's contents (note: this is not recalculated, the recorded checksum is @@ -340,7 +339,6 @@ This operation is a no-op if no edits are present. */ svn_error_t *svn_fs_fs__dag_finalize_edits(dag_node_t *file, const char *checksum, - const char *txn_id, apr_pool_t *pool); Index: subversion/libsvn_fs_fs/dag.c =================================================================== --- subversion/libsvn_fs_fs/dag.c (revision 26949) +++ subversion/libsvn_fs_fs/dag.c (working copy) @@ -911,7 +911,6 @@ svn_error_t * svn_fs_fs__dag_finalize_edits(dag_node_t *file, const char *checksum, - const char *txn_id, apr_pool_t *pool) { unsigned char digest[APR_MD5_DIGESTSIZE];