svn commit: r1618848 - in /subversion/trunk: build.conf subversion/svnfsfs/ subversion/svnfsfs/dump-index-cmd.c subversion/svnfsfs/load-index-cmd.c subversion/svnfsfs/stats-cmd.c tools/server-side/svnfsfs/

[stefan2]

Author: stefan2
Date: Tue Aug 19 12:13:21 2014
New Revision: 1618848

URL: http://svn.apache.org/r1618848
Log:
Move svnfsfs from our tools section to subversion main.

* tools/server-side/svnfsfs: Moved to ...
* subversion/svnfsfs: ... this.

* subversion/svnfsfs/dump-index-cmd.c,
  subversion/svnfsfs/load-index-cmd.c,
  subversion/svnfsfs/stats-cmd.c: Update relative include paths.

* build.conf
  (svnfsfs): Point to the new location.

Added:
    subversion/trunk/subversion/svnfsfs/
      - copied from r1618846, subversion/trunk/tools/server-side/svnfsfs/
Removed:
    subversion/trunk/tools/server-side/svnfsfs/
Modified:
    subversion/trunk/build.conf
    subversion/trunk/subversion/svnfsfs/dump-index-cmd.c
    subversion/trunk/subversion/svnfsfs/load-index-cmd.c
    subversion/trunk/subversion/svnfsfs/stats-cmd.c

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1618848&r1=1618847&r2=1618848&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Aug 19 12:13:21 2014
@@ -427,7 +427,7 @@ install = tools
 [svnfsfs]
 description = Subversion FSFS Repository Manipulation Tool
 type = exe
-path = tools/server-side/svnfsfs
+path = subversion/svnfsfs
 install = bin
 libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv 
apr
 msvc-libs = setargv.obj

Modified: subversion/trunk/subversion/svnfsfs/dump-index-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/dump-index-cmd.c?rev=1618848&r1=1618846&r2=1618848&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/dump-index-cmd.c (original)
+++ subversion/trunk/subversion/svnfsfs/dump-index-cmd.c Tue Aug 19 12:13:21 
2014
@@ -23,11 +23,11 @@
 #include "svn_dirent_uri.h"
 #include "svn_pools.h"
 
-#include "../../../subversion/libsvn_fs_fs/fs.h"
-#include "../../../subversion/libsvn_fs_fs/index.h"
-#include "../../../subversion/libsvn_fs_fs/rev_file.h"
-#include "../../../subversion/libsvn_fs_fs/util.h"
-#include "../../../subversion/libsvn_fs/fs-loader.h"
+#include "../libsvn_fs_fs/fs.h"
+#include "../libsvn_fs_fs/index.h"
+#include "../libsvn_fs_fs/rev_file.h"
+#include "../libsvn_fs_fs/util.h"
+#include "../libsvn_fs/fs-loader.h"
 
 #include "svnfsfs.h"
 

Modified: subversion/trunk/subversion/svnfsfs/load-index-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/load-index-cmd.c?rev=1618848&r1=1618846&r2=1618848&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/load-index-cmd.c (original)
+++ subversion/trunk/subversion/svnfsfs/load-index-cmd.c Tue Aug 19 12:13:21 
2014
@@ -27,9 +27,9 @@
 
 #include "private/svn_sorts_private.h"
 
-#include "../../../subversion/libsvn_fs_fs/index.h"
-#include "../../../subversion/libsvn_fs_fs/transaction.h"
-#include "../../../subversion/libsvn_fs_fs/util.h"
+#include "../libsvn_fs_fs/index.h"
+#include "../libsvn_fs_fs/transaction.h"
+#include "../libsvn_fs_fs/util.h"
 
 #include "svn_private_config.h"
 

Modified: subversion/trunk/subversion/svnfsfs/stats-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/stats-cmd.c?rev=1618848&r1=1618846&r2=1618848&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/stats-cmd.c (original)
+++ subversion/trunk/subversion/svnfsfs/stats-cmd.c Tue Aug 19 12:13:21 2014
@@ -29,11 +29,11 @@
 #include "private/svn_sorts_private.h"
 #include "private/svn_string_private.h"
 
-#include "../../../subversion/libsvn_fs_fs/index.h"
-#include "../../../subversion/libsvn_fs_fs/pack.h"
-#include "../../../subversion/libsvn_fs_fs/rev_file.h"
-#include "../../../subversion/libsvn_fs_fs/util.h"
-#include "../../../subversion/libsvn_fs/fs-loader.h"
+#include "../libsvn_fs_fs/index.h"
+#include "../libsvn_fs_fs/pack.h"
+#include "../libsvn_fs_fs/rev_file.h"
+#include "../libsvn_fs_fs/util.h"
+#include "../libsvn_fs/fs-loader.h"
 
 #include "svn_private_config.h"
 #include "svnfsfs.h"