You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/01/29 13:42:58 UTC
svn commit: r1655635 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: ivan
Date: Thu Jan 29 12:42:58 2015
New Revision: 1655635
URL: http://svn.apache.org/r1655635
Log:
Follow-up to r1629855: Remove duplicate code.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__create_file_tree): Do not write CURRENT file twice during
repository creation.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1655635&r1=1655634&r2=1655635&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Jan 29 12:42:58 2015
@@ -1746,7 +1746,6 @@ svn_fs_fs__create_file_tree(svn_fs_t *fs
pool));
/* Create the 'current' file. */
- SVN_ERR(svn_io_file_create_empty(svn_fs_fs__path_current(fs, pool), pool));
SVN_ERR(svn_fs_fs__write_current(fs, 0, 1, 1, pool));
/* Create the 'uuid' file. */
Re: svn commit: r1655635 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 29 January 2015 at 16:39, Philip Martin <ph...@wandisco.com> wrote:
> ivan@apache.org writes:
>
>> /* Create the 'current' file. */
>> - SVN_ERR(svn_io_file_create_empty(svn_fs_fs__path_current(fs, pool), pool));
>> SVN_ERR(svn_fs_fs__write_current(fs, 0, 1, 1, pool));
>
> This causes failures on Unix.
>
> svn_fs_fs__write_current() needs to use some file as a source of the
> permissions for the new file. At the moment the source file is the
> 'current' file itself which means the file must exist before calling
> svn_fs_fs__write_current().
>
Thanks!
I've reverted this change in r1655664.
Possible solution will be to add new function
svn_fs_fs__create_current() and use it in
svn_fs_fs__create_file_tree(), but I am not sure it's worth it.
--
Ivan Zhakov
Re: svn commit: r1655635 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Philip Martin <ph...@wandisco.com>.
ivan@apache.org writes:
> /* Create the 'current' file. */
> - SVN_ERR(svn_io_file_create_empty(svn_fs_fs__path_current(fs, pool), pool));
> SVN_ERR(svn_fs_fs__write_current(fs, 0, 1, 1, pool));
This causes failures on Unix.
svn_fs_fs__write_current() needs to use some file as a source of the
permissions for the new file. At the moment the source file is the
'current' file itself which means the file must exist before calling
svn_fs_fs__write_current().
--
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*