subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1330258 - /subversion/trunk/subversion/libsvn_client/diff.c
Date Wed, 25 Apr 2012 13:10:41 GMT
Author: stsp
Date: Wed Apr 25 13:10:41 2012
New Revision: 1330258

URL: http://svn.apache.org/viewvc?rev=1330258&view=rev
Log:
Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"

This change prevents the assertion and causes an error message instead:
"svn: E195002: PREV, BASE, or COMMITTED revision keywords are invalid for URL"

* subversion/libsvn_client/diff.c
  (check_paths): Do not claim that a URL with a local revision was a local path.

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=1330258&r1=1330257&r2=1330258&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Wed Apr 25 13:10:41 2012
@@ -1446,8 +1446,8 @@ check_paths(svn_boolean_t *is_repos1,
                                 _("At least one revision must be non-local "
                                   "for a pegged diff"));
 
-      *is_repos1 = ! is_local_rev1;
-      *is_repos2 = ! is_local_rev2;
+      *is_repos1 = ! is_local_rev1 || svn_path_is_url(path_or_url1);
+      *is_repos2 = ! is_local_rev2 || svn_path_is_url(path_or_url2);
     }
   else
     {



Mime
View raw message