svn commit: r1099507 - /subversion/trunk/subversion/tests/cmdline/switch_tests.py

[pb...@apache.org]

Author: pburba
Date: Wed May  4 16:15:27 2011
New Revision: 1099507

URL: http://svn.apache.org/viewvc?rev=1099507&view=rev
Log:
Add a test for issue #3871 "'svn up' with subtree switched to root asserts".

* subversion/tests/cmdline/switch_tests.py

  (up_to_old_rev_with_subtree_switched_to_root): New.

  (test_list): Add up_to_old_rev_with_subtree_switched_to_root.

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

Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1099507&r1=1099506&r2=1099507&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Wed May  4 16:15:27 2011
@@ -3181,6 +3181,36 @@ def relocate_with_relative_externals(sbo
   svntest.actions.run_and_verify_info([{ 'URL' : '.*.other/A/D/H$' }],
                                       os.path.join(wc_dir, 'A', 'B', 'H-ext'))
 
+@Issue(3871)
+@XFail()
+def up_to_old_rev_with_subtree_switched_to_root(sbox):
+  "up to old rev with subtree switched to root"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  # Some paths we'll care about.
+  A_path = os.path.join(wc_dir, 'A')
+  branch_path = os.path.join(wc_dir, 'branch')
+
+  # Starting with a vanilla greek tree, create a branch of A, switch
+  # that branch to the root of the repository, then update the WC to
+  # r1.
+  svntest.actions.run_and_verify_svn(None, None, [], 'copy', A_path,
+                                     branch_path)
+  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+                                     '-m', 'Create a branch')
+  svntest.actions.run_and_verify_svn(None, None, [], 'sw', sbox.repo_url,
+                                     branch_path, '--ignore-ancestry')
+
+  # Now update the WC to r1.  This should work but currently fails with
+  # this assertion.
+  #
+  #   >svn up -r1
+  #   Updating '.':
+  #   Assertion failed: svn_fspath__is_canonical(fspath),
+  #     file ..\..\..\subversion\libsvn_subr\dirent_uri.c, line 2536
+  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
 
 ########################################################################
 # Run the tests
@@ -3226,6 +3256,7 @@ test_list = [ None,
               relocate_with_switched_children,
               copy_with_switched_subdir,
               relocate_with_relative_externals,
+              up_to_old_rev_with_subtree_switched_to_root,
               ]
 
 if __name__ == '__main__':