svn commit: r1410330 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

[ph...@apache.org]

Author: philip
Date: Fri Nov 16 13:08:10 2012
New Revision: 1410330

URL: http://svn.apache.org/viewvc?rev=1410330&view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
  (copy_added_dir_with_copy): Extend to explictly test mv as well as cp.

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

Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1410330&r1=1410329&r2=1410330&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Nov 16 13:08:10 2012
@@ -4359,13 +4359,14 @@ def nonrecursive_commit_of_copy(sbox):
 # and then renaming the subdir, breaks history of the moved files.
 @Issue(3474)
 def copy_added_dir_with_copy(sbox):
-  """copy of new dir with copied file keeps history"""
+  """copy/mv of new dir with copied file keeps history"""
 
   sbox.build(read_only=True)
   wc_dir = sbox.wc_dir
 
   new_dir = sbox.ospath('NewDir');
   new_dir2 = sbox.ospath('NewDir2');
+  new_dir3 = sbox.ospath('NewDir3');
 
   # Alias for svntest.actions.run_and_verify_svn
   rav_svn = svntest.actions.run_and_verify_svn
@@ -4386,6 +4387,16 @@ def copy_added_dir_with_copy(sbox):
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
+  # move of added dir also retains copy history of children
+  rav_svn(None, None, [], 'mv', new_dir, new_dir3)
+  expected_status.remove('NewDir', 'NewDir/mu')
+  expected_status.add(
+    {
+      'NewDir3'           : Item(status='A ', wc_rev='0'),
+      'NewDir3/mu'        : Item(status='A ', copied='+', wc_rev='-'),
+    })
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
 
 @SkipUnless(svntest.main.is_posix_os)
 @Issue(3303)