svn commit: r1605866 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 26 18:06:56 2014
New Revision: 1605866

URL: http://svn.apache.org/r1605866
Log:
Add a new XFail test, reproducing a missing node error reported when diffing
a replaced node below a copy or move against a repository location.

Found by: stsp

* subversion/tests/cmdline/diff_tests.py
  (diff_replaced_moved): New test.
  (test_list): Add diff_replaced_moved.

Modified:
    subversion/trunk/subversion/tests/cmdline/diff_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1605866&r1=1605865&r2=1605866&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Jun 26 18:06:56 2014
@@ -4762,6 +4762,28 @@ def diff_deleted_in_move_against_repos(s
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'diff', sbox.wc_dir, '-r2')
 
+@XFail()
+def diff_replaced_moved(sbox):
+  "diff against a replaced moved node"
+
+  sbox.build(read_only=True)
+  sbox.simple_move('A', 'AA')
+  sbox.simple_rm('AA/B')
+  sbox.simple_move('AA/D', 'AA/B')
+
+  # Ok
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'diff', sbox.ospath('.'), '-r1')
+
+  # Ok (rhuijben: Works through a hack assuming some BASE knowledge)
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'diff', sbox.ospath('AA'), '-r1')
+
+  # Error (misses BASE node because the diff editor is driven incorrectly)
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'diff', sbox.ospath('AA/B'), '-r1')
+
+
 
 ########################################################################
 #Run the tests
@@ -4851,6 +4873,7 @@ test_list = [ None,
               diff_switched_file,
               diff_parent_dir,
               diff_deleted_in_move_against_repos,
+              diff_replaced_moved,
               ]
 
 if __name__ == '__main__':