subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1628431 - /subversion/trunk/subversion/tests/cmdline/externals_tests.py
Date Tue, 30 Sep 2014 13:13:44 GMT
Author: stsp
Date: Tue Sep 30 13:13:44 2014
New Revision: 1628431

URL: http://svn.apache.org/r1628431
Log:
Extend XFail test for issue #4085, "external can shadow a versioned directory"

* subversion/tests/cmdline/externals_tests.py
  (shadowing): Try to remove the shadowed directory and update the working copy.
   This shows that the working copy remains wedged even if the user attempts
   to recover from the situation by removing the offending directory.

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

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1628431&r1=1628430&r2=1628431&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Sep 30 13:13:44 2014
@@ -2799,19 +2799,24 @@ def include_immediate_dir_externals(sbox
 def shadowing(sbox):
   "external shadows an existing dir"
 
-  sbox.build(read_only=True)
+  sbox.build()
   wc_dir = sbox.wc_dir
 
   # Setup external: /A/B/F as 'C' child of /A
   externals_prop = "^/A/B/F C\n"
+  change_external(sbox.ospath('A'), externals_prop, commit=False)
+
+  # An update errors out because the external is shadowed by an existing dir
+  svntest.main.run_svn("W205011: Error handling externals definition for '%s'"
+    % (sbox.wc_dir) + "/A/C", 'update', wc_dir)
+
+  # Remove the shadowed directory to unblock the external
+  svntest.main.run_svn(None, 'rm', sbox.repo_url + '/A/C', '-m', 'remove A/C')
+
+  # Another update should unwedge the working copy and fetch the external
+  # but this currently fails :-(  The user needs to get a new checkout...
+  sbox.simple_update()
 
-  raised = False
-  try:
-    change_external(sbox.ospath('A'), externals_prop, commit=False)
-  except:
-    raised = True
-  if not raised:
-    raise svntest.Failure("Creating conflicting child 'C' of 'A' didn't error")
 
 # Test for issue #4093 'remapping a file external can segfault due to
 # "deleted" props'.



Mime
View raw message