svn commit: r1081628 - /subversion/trunk/subversion/tests/cmdline/changelist_tests.py

[da...@apache.org]

Author: danielsh
Date: Tue Mar 15 01:24:33 2011
New Revision: 1081628

URL: http://svn.apache.org/viewvc?rev=1081628&view=rev
Log:
* subversion/tests/cmdline/changelist_tests.py
  (change_to_dir): Extend to cover a merge that replaces a file with a dir.
    (This is a test for issue #3820.)

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

Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=1081628&r1=1081627&r2=1081628&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Tue Mar 15 01:24:33 2011
@@ -1129,11 +1129,11 @@ def move_added_keeps_changelist(sbox):
   ]
   svntest.actions.run_and_verify_info(expected_infos, kappa2_path)
 
-@Issue(3820)  ### Extend to cover a merge that replaces a file with a dir
+@Issue(3820)
 def change_to_dir(sbox):
   "change file in changelist to dir"
 
-  sbox.build(read_only = True)
+  sbox.build()
 
   # No changelist initially
   expected_infos = [{'Name' : 'mu', 'Changelist' : None}]
@@ -1150,11 +1150,25 @@ def change_to_dir(sbox):
   svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
 
   # A/mu removed from changelist after replace with directory
+  # TODO: stdout should have an 'rm-from-changelist' notification
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'mkdir', sbox.ospath('A/mu'))
   expected_infos = [{'Changelist' : None}] # No Name for directories?
   svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
 
+  svntest.main.run_svn(None, "commit", "-m", "r2: replace A/mu: file->dir",
+                       sbox.ospath('A'))
+  svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
+
+  svntest.main.run_svn(None, "update", "-r", "1", sbox.ospath('A'))
+  expected_infos = [{'Name' : 'mu', 'Changelist' : None}]
+  svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
+
+  expected_infos = [{'Changelist' : None}] # No Name for directories?
+  svntest.main.run_svn(None, "merge", "-c", "2", sbox.ospath('A'),
+                       sbox.ospath('A'))
+  svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
+
 
 @Issue(3822)
 def revert_deleted_in_changelist(sbox):