You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/04 09:12:39 UTC

svn commit: r1538519 - in /subversion/trunk/subversion: libsvn_wc/diff_editor.c tests/cmdline/diff_tests.py

Author: stsp
Date: Mon Nov  4 08:12:39 2013
New Revision: 1538519

URL: http://svn.apache.org/r1538519
Log:
Fix issue #4444, "diffing move inside a copy asserts".

* subversion/libsvn_wc/diff_editor.c
  (svn_wc__diff_local_only_file): Skip deleted files when comparing
   against the working tree, like done in svn_wc__diff_local_only_dir().

* subversion/tests/cmdline/diff_tests.py
  (diff_move_inside_copy): Remove XFail marker.

Modified:
    subversion/trunk/subversion/libsvn_wc/diff_editor.c
    subversion/trunk/subversion/tests/cmdline/diff_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1538519&r1=1538518&r2=1538519&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Mon Nov  4 08:12:39 2013
@@ -952,6 +952,11 @@ 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/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1538519&r1=1538518&r2=1538519&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Mon Nov  4 08:12:39 2013
@@ -4649,7 +4649,6 @@ def diff_local_missing_obstruction(sbox)
 
 
 @Issue(4444)
-@XFail()
 def diff_move_inside_copy(sbox):
   "diff copied-along child that contains a moved file"
   sbox.build(read_only=True)