You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/16 15:37:41 UTC
svn commit: r923764 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/libsvn_fs_fs/fs_fs.c
Author: hwright
Date: Tue Mar 16 14:37:41 2010
New Revision: 923764
URL: http://svn.apache.org/viewvc?rev=923764&view=rev
Log:
Merge r905303 from trunk:
* r905303
Make 'svnadmin hotcopy' copy fsfs.conf for FSFS repositories.
Justification:
svnadmin hotcopy is supposed to copy all files.
Votes:
+1: stsp, cmpilato, rhuijben
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 14:37:41 2010
@@ -57,4 +57,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,895514,895653,896522,898963,899826,899828,900797,901752,904594,905326,922516
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,895514,895653,896522,898963,899826,899828,900797,901752,904594,905303,905326,922516
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 14:37:41 2010
@@ -56,4 +56,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-901365,901752,904594,905326,922516
+/subversion/trunk/CHANGES:875962-901365,901752,904594,905303,905326,922516
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=923764&r1=923763&r2=923764&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue Mar 16 14:37:41 2010
@@ -238,13 +238,6 @@ Approved changes:
Votes:
+1: neels, cmpilato, rhuijben
- * r905303
- Make 'svnadmin hotcopy' copy fsfs.conf for FSFS repositories.
- Justification:
- svnadmin hotcopy is supposed to copy all files.
- Votes:
- +1: stsp, cmpilato, rhuijben
-
* r906256, r906305
Fix issue #3573 'local non-inheritable mergeinfo changes not properly
merged with updated mergeinfo'
Modified: subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c?rev=923764&r1=923763&r2=923764&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.6.x/subversion/libsvn_fs_fs/fs_fs.c Tue Mar 16 14:37:41 2010
@@ -1419,6 +1419,9 @@ svn_fs_fs__hotcopy(const char *src_path,
/* Copy the uuid. */
SVN_ERR(svn_io_dir_file_copy(src_path, dst_path, PATH_UUID, pool));
+ /* Copy the config. */
+ SVN_ERR(svn_io_dir_file_copy(src_path, dst_path, PATH_CONFIG, pool));
+
/* Copy the min unpacked rev, and read its value. */
if (format >= SVN_FS_FS__MIN_PACKED_FORMAT)
{