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

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 26 16:02:30 2014
New Revision: 1605832

URL: http://svn.apache.org/r1605832
Log:
Fix diffing locally deleted nodes that happen to be directly below
directories that were copied, but via the default ignore-ancestry
handling processed as if they exist in the repository.
(Yes, hard to explain... see testcase added in r1605810,r1605813)

The more common case of nodes that were deeper below such directories
use the standard local diff code which has much better test coverage.

* subversion/libsvn_wc/diff_editor.c
  (walk_local_nodes_diff): Properly handle svn_wc__db_status_deleted when there
    is no base node.

* subversion/tests/cmdline/diff_tests.py
  (diff_deleted_in_move_against_repos): 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=1605832&r1=1605831&r2=1605832&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Thu Jun 26 16:02:30 2014
@@ -717,6 +717,9 @@ walk_local_nodes_diff(struct edit_baton_
           if (!info->have_base)
             {
               local_only = TRUE; /* Only report additions */
+
+              if (info->status == svn_wc__db_status_deleted)
+                continue; /* Nothing added (deleted copy) */
             }
           else if (info->status == svn_wc__db_status_normal)
             {

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1605832&r1=1605831&r2=1605832&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Jun 26 16:02:30 2014
@@ -4728,7 +4728,6 @@ def diff_parent_dir(sbox):
   finally:
     os.chdir(was_cwd)
 
-@XFail()
 def diff_deleted_in_move_against_repos(sbox):
   "diff deleted in move against repository"