svn commit: r1822023 - /subversion/trunk/subversion/libsvn_client/diff.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Jan 23 16:04:29 2018
New Revision: 1822023

URL: http://svn.apache.org/viewvc?rev=1822023&view=rev
Log:
Make a diff API error message more correct.

* subversion/libsvn_client/diff.c
  (diff_wc_wc): State what diffs are now supported.

Modified:
    subversion/trunk/subversion/libsvn_client/diff.c

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1822023&r1=1822022&r2=1822023&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Jan 23 16:04:29 2018
@@ -1854,8 +1854,9 @@ diff_wc_wc(const char **root_relpath,
              && (revision2->kind == svn_opt_revision_working))))
     return unsupported_diff_error(
        svn_error_create(SVN_ERR_INCORRECT_PARAMS, NULL,
-                        _("Only diffs between a path's text-base "
-                          "and its working files are supported at this time"
+                        _("A non-URL diff at this time must be either from "
+                          "a path's base to the same path's working version "
+                          "or between the working versions of two paths"
                           )));
 
   if (ddi)
@@ -2406,6 +2407,7 @@ do_diff(const char **root_relpath,
 
               /* ### What about ddi? */
               /* Ignores changelists, ignore_ancestry */
+              SVN_DBG(("arbi"));
               SVN_ERR(svn_client__arbitrary_nodes_diff(root_relpath, root_is_dir,
                                                        abspath1, abspath2,
                                                        depth,