You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/01/24 17:06:52 UTC

svn commit: r1654552 - /subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py

Author: stsp
Date: Sat Jan 24 16:06:52 2015
New Revision: 1654552

URL: http://svn.apache.org/r1654552
Log:
On the pin-externals test, extend the regression test to cover moved parent
directories of externals.

* subversion/tests/cmdline/externals_tests.py
  (copy_pin_externals): Move A/D in the first test repository to A/D-moved
   and verify that externals are still pinned correctly. Add some comments.

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=1654552&r1=1654551&r2=1654552&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 16:06:52 2015
@@ -3671,10 +3671,25 @@ def copy_pin_externals(sbox):
                                      wc_dir + '/A',
                                      wc_dir + '/A_copy',
                                      '--pin-externals')
+  # gamma was moved so its path and expected last-changed revision change
   last_changed_rev_gamma = 11
   external_url_for["A/B/gamma"] = '^/A/D/gamma-moved'
   verify_pinned_externals(wc_dir)
 
+  sbox.simple_update()
+  sbox.simple_move('A/D', 'A/D-moved')
+  change_external(sbox.ospath('A/B'), '^/A/D-moved/gamma-moved gamma', commit=False)
+  sbox.simple_commit()
+  sbox.simple_update()
+  # While gamma's path has changed by virtue of being moved along with
+  # its parent A/D, gamma's last-changed rev should not have changed.
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'copy',
+                                     wc_dir + '/A',
+                                     wc_dir + '/A_copy',
+                                     '--pin-externals')
+  verify_pinned_externals(wc_dir)
+
 
 ########################################################################
 # Run the tests