subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1494440 - in /subversion/branches/1.8.x: ./ STATUS tools/server-side/fsfs-stats.c
Date Wed, 19 Jun 2013 04:00:39 GMT
Author: svn-role
Date: Wed Jun 19 04:00:39 2013
New Revision: 1494440

URL: http://svn.apache.org/r1494440
Log:
Merge r1492164 from trunk:

 * r1492164
   Invalid repository paths cause a segfault in the fsfs-stats tool.
   Justification:
     Don't segfault.
   Votes:
     +1: stefan2, stsp, danielsh

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/tools/server-side/fsfs-stats.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1492164

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1494440&r1=1494439&r2=1494440&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 19 04:00:39 2013
@@ -223,13 +223,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1492164
-   Invalid repository paths cause a segfault in the fsfs-stats tool.
-   Justification:
-     Don't segfault.
-   Votes:
-     +1: stefan2, stsp, danielsh
-
  * r1493951
    Fix 'svn-bench' misreporting itself as 'svn'.
    Justification:

Modified: subversion/branches/1.8.x/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/tools/server-side/fsfs-stats.c?rev=1494440&r1=1494439&r2=1494440&view=diff
==============================================================================
--- subversion/branches/1.8.x/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/1.8.x/tools/server-side/fsfs-stats.c Wed Jun 19 04:00:39 2013
@@ -2169,13 +2169,13 @@ int main(int argc, const char *argv[])
   svn_err = read_revisions(&fs, repo_path, start_revision, memsize, pool);
   printf("\n");
 
-  print_stats(fs, pool);
-
   if (svn_err)
     {
       svn_handle_error2(svn_err, stdout, FALSE, ERROR_TAG);
       return 2;
     }
 
+  print_stats(fs, pool);
+
   return 0;
 }



Mime
View raw message