svn commit: r1429996 - /subversion/trunk/subversion/svn/switch-cmd.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jan  7 20:29:38 2013
New Revision: 1429996

URL: http://svn.apache.org/viewvc?rev=1429996&view=rev
Log:
Print a more user-oriented error message when the target to 'svn switch' is
not (or does not appear to be) in the same repository. Fixes issue #2337,
'Usability: misleading message when switching to a foreign repository'.

* subversion/svn/switch-cmd.c
  (svn_cl__switch): Wrap two error codes with a high-level error message.

Modified:
    subversion/trunk/subversion/svn/switch-cmd.c

Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=1429996&r1=1429995&r2=1429996&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Mon Jan  7 20:29:38 2013
@@ -176,6 +176,12 @@ svn_cl__switch(apr_getopt_t *os,
                                    "disable this check."),
                                    svn_dirent_local_style(target,
                                                           scratch_pool));
+      if (err->apr_err == SVN_ERR_RA_UUID_MISMATCH
+          || err->apr_err == SVN_ERR_WC_INVALID_SWITCH)
+        return svn_error_quick_wrap(
+                 err,
+                 _("'svn switch' does not support switching a working copy to "
+                   "a different repository"));
       return err;
     }