Hi,

following patch adds a test case for issue #4642: ""svn update
--set-depth=exclude" exits prematurely, leaving repo in need of cleanup"
[1].

[[[
Add an XFail test for issue #4642 (Setting depth to exclude for a path
containing unversioned files requires a cleanup afterwards).

* subversion/tests/cmdline/depth_tests.py
  (fold_tree_with_deleted_moved_items): New XFail test for issue #4642.
]]]

[1] https://issues.apache.org/jira/browse/SVN-4642

Regards,
Stefan

Index: subversion/tests/cmdline/depth_tests.py
===================================================================
--- subversion/tests/cmdline/depth_tests.py     (revision 1764905)
+++ subversion/tests/cmdline/depth_tests.py     (working copy)
@@ -2957,6 +2957,24 @@
                                         '--set-depth', 'empty', A_path)
   verify_depth(None, "empty", A_path)
 
+@Issue(4642)
+@XFail()
+def fold_tree_with_unversioned_items(sbox):
+  "unversioned files in excluded directory"
+  ign_a, ign_b, ign_c, wc_dir = set_up_depthy_working_copies(sbox,
+                                                             infinity=True)
+
+  # create an unversioned directory within a versioned one
+  A_path = sbox.ospath('A')
+  A_local_path = os.path.join(A_path, 'A_local')
+  os.mkdir(A_local_path)
+
+  # Set A to be excluded.
+  svntest.main.run_svn(None, 'update', '--set-depth=exclude', A_path)
+  
+  # try a simple update afterwards
+  svntest.main.run_svn(None, 'update', wc_dir)
+  
 #----------------------------------------------------------------------
 # list all tests here, starting with None:
 test_list = [ None,
@@ -3009,6 +3027,7 @@
               spurious_nodes_row,
               commit_excluded,
                          fold_tree_with_deleted_moved_items,
+                         fold_tree_with_unversioned_items,
               ]
 
 if __name__ == "__main__":

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Reply via email to