You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/01/26 21:25:52 UTC
svn commit: r1561544 - in /subversion/branches/1.8.x-r1560723-and-friends:
./ subversion/libsvn_fs_fs/rep-cache.c subversion/libsvn_subr/sqlite.c
Author: stefan2
Date: Sun Jan 26 20:25:52 2014
New Revision: 1561544
URL: http://svn.apache.org/r1561544
Log:
On the 1.8.x-r1560723-and-friends branch:
Sync with parent to make everything compile again.
There were no conflicts.
Modified:
subversion/branches/1.8.x-r1560723-and-friends/ (props changed)
subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_subr/sqlite.c
Propchange: subversion/branches/1.8.x-r1560723-and-friends/
------------------------------------------------------------------------------
Merged /subversion/branches/1.8.x:r1561538-1561543
Modified: subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_fs_fs/rep-cache.c?rev=1561544&r1=1561543&r2=1561544&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_fs_fs/rep-cache.c Sun Jan 26 20:25:52 2014
@@ -94,7 +94,7 @@ open_rep_cache(void *baton,
if (!exists)
{
const char *current = svn_fs_fs__path_current(fs, pool);
- svn_error_t *err = svn_io_file_create_empty(db_path, pool);
+ svn_error_t *err = svn_io_file_create(db_path, "", pool);
if (err && !APR_STATUS_IS_EEXIST(err->apr_err))
/* A real error. */
Modified: subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_subr/sqlite.c?rev=1561544&r1=1561543&r2=1561544&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.8.x-r1560723-and-friends/subversion/libsvn_subr/sqlite.c Sun Jan 26 20:25:52 2014
@@ -789,7 +789,7 @@ internal_open(sqlite3 **db3, const char
We simply want umask permissions. */
SVN_ERR(svn_io_check_path(path, &kind, scratch_pool));
if (kind == svn_node_none)
- SVN_ERR(svn_io_file_create_empty(path, scratch_pool));
+ SVN_ERR(svn_io_file_create(path, "", scratch_pool));
}
#endif