subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1654542 - /subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
Date Sat, 24 Jan 2015 15:27:07 GMT
Author: stsp
Date: Sat Jan 24 15:27:07 2015
New Revision: 1654542

URL: http://svn.apache.org/r1654542
Log:
On the pin-externals test, extend the regression test.

* subversion/tests/cmdline/externals_tests.py
  (copy_pin_externals): Move a file and verify that the last-changed
   revision caused by the move is used while pinning the external.

Modified:
    subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py?rev=1654542&r1=1654541&r2=1654542&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py Sat Jan
24 15:27:07 2015
@@ -3640,6 +3640,31 @@ def copy_pin_externals(sbox):
                                      '--pin-externals')
   verify_pinned_externals(wc_dir)
 
+  # Clean up.
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                    'revert', '-R', wc_dir)
+  svntest.main.safe_rmtree(os.path.join(wc_dir, 'A_copy'))
+
+  # Test behaviour for external URLs which were moved since
+  # their last-changed revision.
+  sbox.simple_move('A/D/gamma', 'A/D/gamma-moved')
+  sbox.simple_commit()
+  change_external(sbox.ospath('A/B'), '^/A/D/gamma-moved gamma', commit=True)
+  sbox.simple_update()
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'copy',
+                                     wc_dir + '/A',
+                                     wc_dir + '/A_copy',
+                                     '--pin-externals')
+  expected_output = [
+    '-r11 ^/A/D/gamma-moved@11 gamma\n',
+    '\n',
+  ]
+  svntest.actions.run_and_verify_svn(None, expected_output, [],
+                                     'propget', 'svn:externals',
+                                      sbox.ospath('A_copy/B'))
+
+
 ########################################################################
 # Run the tests
 



Mime
View raw message