You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/11/27 14:40:51 UTC
svn commit: r1546032 - in /subversion/trunk/subversion: include/svn_fs.h
libsvn_fs/editor.c libsvn_repos/fs-wrap.c
Author: philip
Date: Wed Nov 27 13:40:51 2013
New Revision: 1546032
URL: http://svn.apache.org/r1546032
Log:
Deprecate svn_fs_commit_txn in favour of svn_fs_commit_txn2.
* subversion/include/svn_fs.h
(svn_fs_commit_txn): Deprecate.
* subversion/libsvn_repos/fs-wrap.c
(svn_repos_fs_commit_txn): Call newer function.
* subversion/libsvn_fs/editor.c
(svn_fs__editor_commit): Call newer function.
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs/editor.c
subversion/trunk/subversion/libsvn_repos/fs-wrap.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1546032&r1=1546031&r2=1546032&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Wed Nov 27 13:40:51 2013
@@ -1065,7 +1065,10 @@ svn_fs_commit_txn2(const char **conflict
/*
* Same as svn_fs_commit_txn2(), but with @a set_timestamp
* always set to @c TRUE.
+ *
+ * @deprecated Provided for backward compatibility with the 1.8 API.
*/
+SVN_DEPRECATED
svn_error_t *
svn_fs_commit_txn(const char **conflict_p,
svn_revnum_t *new_rev,
Modified: subversion/trunk/subversion/libsvn_fs/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/editor.c?rev=1546032&r1=1546031&r2=1546032&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/editor.c (original)
+++ subversion/trunk/subversion/libsvn_fs/editor.c Wed Nov 27 13:40:51 2013
@@ -789,10 +789,11 @@ svn_fs__editor_commit(svn_revnum_t *revi
it placed into RESULT_POOL. */
if (!err)
- err = svn_fs_commit_txn(&inner_conflict_path,
- revision,
- eb->txn,
- scratch_pool);
+ err = svn_fs_commit_txn2(&inner_conflict_path,
+ revision,
+ eb->txn,
+ TRUE,
+ scratch_pool);
if (SVN_IS_VALID_REVNUM(*revision))
{
if (err)
Modified: subversion/trunk/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/fs-wrap.c?rev=1546032&r1=1546031&r2=1546032&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/trunk/subversion/libsvn_repos/fs-wrap.c Wed Nov 27 13:40:51 2013
@@ -86,7 +86,7 @@ svn_repos_fs_commit_txn(const char **con
svn_pool_destroy(iterpool);
/* Commit. */
- err = svn_fs_commit_txn(conflict_p, new_rev, txn, pool);
+ err = svn_fs_commit_txn2(conflict_p, new_rev, txn, TRUE, pool);
if (! SVN_IS_VALID_REVNUM(*new_rev))
return err;