subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1531014 - /subversion/trunk/subversion/tests/cmdline/move_tests.py
Date Thu, 10 Oct 2013 15:07:23 GMT
Author: rhuijben
Date: Thu Oct 10 15:07:22 2013
New Revision: 1531014

URL: http://svn.apache.org/r1531014
Log:
* subversion/tests/cmdline/move_tests.py
  (move_del_moved): Add regression test for issue #4437.
  (test_list): Add move_del_moved.

Reported by: Brett Gerhardi <brett.gerhardi{_AT_}grg.com>

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

Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1531014&r1=1531013&r2=1531014&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Oct 10 15:07:22 2013
@@ -1500,6 +1500,28 @@ def move_many_update_add(sbox):
                                         None, None, None,
                                         wc_dir, '--accept', 'mine-conflict')
 
+@Issue(4437)
+@XFail()
+def move_del_moved(sbox):
+  "delete moved node, still a move"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  sbox.simple_mkdir('A/NEW')
+  sbox.simple_move('A/mu', 'A/NEW/mu')
+  sbox.simple_rm('A/NEW/mu')
+
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+  expected_status.tweak('A/mu', status='D ')
+  expected_status.add({
+      'A/NEW' : Item(status='A ', wc_rev='-')
+    })
+
+  # A/mu still reports that it is moved to A/NEW/mu, while it is already
+  # deleted there.
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
 
 #######################################################################
 # Run the tests
@@ -1515,6 +1537,7 @@ test_list = [ None,
               nested_replaces,
               move_many_update_delete,
               move_many_update_add,
+              move_del_moved,
             ]
 
 if __name__ == '__main__':



Mime
View raw message