subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1330649 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/diff.c
Date Thu, 26 Apr 2012 04:02:05 GMT
Author: svn-role
Date: Thu Apr 26 04:02:05 2012
New Revision: 1330649

URL: http://svn.apache.org/viewvc?rev=1330649&view=rev
Log:
Merge r1330258 from trunk:

 * r1330258
   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
   Justification:
     Regression from 1.6. Users should not run into assertions.
   Votes:
     +1: stsp, danielsh, philip

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_client/diff.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1330258

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1330649&r1=1330648&r2=1330649&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Apr 26 04:02:05 2012
@@ -135,13 +135,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1330258
-   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
-   Justification:
-     Regression from 1.6. Users should not run into assertions.
-   Votes:
-     +1: stsp, danielsh, philip
-
  * r1329876
    Properly report files that have just their lock removed as part of
    an update.

Modified: subversion/branches/1.7.x/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_client/diff.c?rev=1330649&r1=1330648&r2=1330649&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_client/diff.c Thu Apr 26 04:02:05 2012
@@ -1435,8 +1435,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