svn commit: r1449659 - /subversion/trunk/subversion/svn/svn.c

[st...@apache.org]

Author: stsp
Date: Mon Feb 25 11:11:18 2013
New Revision: 1449659

URL: http://svn.apache.org/r1449659
Log:
* subversion/svn/svn.c
  (sub_main): If some operation fails with SQLITE_BUSY, wrap the error in a
   message that hings at possible causes, such as other long-running processes
   or missing locking support on network filesystems. This should help some
   users with fixing the problem on their own.

Modified:
    subversion/trunk/subversion/svn/svn.c

Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1449659&r1=1449658&r2=1449659&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon Feb 25 11:11:18 2013
@@ -2829,6 +2829,18 @@ sub_main(int argc, const char *argv[], a
                          "(type 'svn help cleanup' for details)"));
         }
 
+      if (err->apr_err == SVN_ERR_SQLITE_BUSY)
+        {
+          err = svn_error_quick_wrap(err,
+                                     _("Another process is blocking the "
+                                       "working copy database, or the "
+                                       "underlying filesystem does not "
+                                       "support file locking; if the working "
+                                       "copy is on a network filesystem, make "
+                                       "sure file locking has been enabled "
+                                       "on the file server"));
+        }
+
       return EXIT_ERROR(err);
     }
   else