subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1538574 - in /subversion/trunk/subversion/libsvn_wc: diff_editor.c diff_local.c
Date Mon, 04 Nov 2013 12:12:49 GMT
Author: rhuijben
Date: Mon Nov  4 12:12:49 2013
New Revision: 1538574

URL: http://svn.apache.org/r1538574
Log:
Following up on r1538519, don't make a function work in an unsupported scenario,
but make the caller skip the call to this function and its directory sibling.

* subversion/libsvn_wc/diff_editor.c
  (svn_wc__diff_local_only_file): Revert r1538519 change.

* subversion/libsvn_wc/diff_local.c
  (diff_status_callback): Don't call the diff local functions if the local node
    is deleted.

Modified:
    subversion/trunk/subversion/libsvn_wc/diff_editor.c
    subversion/trunk/subversion/libsvn_wc/diff_local.c

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1538574&r1=1538573&r2=1538574&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Mon Nov  4 12:12:49 2013
@@ -952,11 +952,6 @@ svn_wc__diff_local_only_file(svn_wc__db_
                                db, local_abspath,
                                scratch_pool, scratch_pool));
 
-  /* If comparing against WORKING, skip entries that are
-     schedule-deleted - they don't really exist. */
-  if (!diff_pristine && status == svn_wc__db_status_deleted)
-    return SVN_NO_ERROR;
-
   assert(kind == svn_node_file
          && (status == svn_wc__db_status_normal
              || status == svn_wc__db_status_added

Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1538574&r1=1538573&r2=1538574&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Mon Nov  4 12:12:49 2013
@@ -390,7 +390,7 @@ diff_status_callback(void *baton,
           }
       }
 
-    if (local_only)
+    if (local_only && (db_status != svn_wc__db_status_deleted))
       {
         if (db_kind == svn_node_file)
           SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,



Mime
View raw message