You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/06 06:23:10 UTC
svn commit: r1565079 - in /subversion/branches/1.8.x: ./ STATUS
subversion/tests/cmdline/move_tests.py
Author: breser
Date: Thu Feb 6 05:23:10 2014
New Revision: 1565079
URL: http://svn.apache.org/r1565079
Log:
Merge r1551524 from trunk:
* r1551524, 1551579
Fix an 'No Write Lock' error when moving files between externals and
parent working copies or vice versa.
Justification:
svn move should just work in these cases.
Votes:
+1: rhuijben, stefan2, breser
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/tests/cmdline/move_tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1551524
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1565079&r1=1565078&r2=1565079&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Feb 6 05:23:10 2014
@@ -206,14 +206,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1551524, 1551579
- Fix an 'No Write Lock' error when moving files between externals and
- parent working copies or vice versa.
- Justification:
- svn move should just work in these cases.
- Votes:
- +1: rhuijben, stefan2, breser
-
* r1549858, r1549874
Make svn_client_proplist4() behave as documented when reporting inherited
properties.
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/move_tests.py?rev=1565079&r1=1565078&r2=1565079&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/move_tests.py Thu Feb 6 05:23:10 2014
@@ -1397,6 +1397,30 @@ def move_many_update_add(sbox):
wc_dir, '--accept', 'mine-conflict')
+@XFail()
+def move_to_from_external(sbox):
+ "move to and from an external"
+
+ sbox.build()
+ sbox.simple_propset('svn:externals', '^/A/D/G GG', '')
+ sbox.simple_update()
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'move',
+ sbox.ospath('GG/tau'),
+ sbox.ospath('tau'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'move',
+ sbox.ospath('iota'),
+ sbox.ospath('GG/tau'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ic',
+ sbox.ospath(''),
+ sbox.ospath('GG'))
+
+
#######################################################################
# Run the tests
@@ -1410,6 +1434,7 @@ test_list = [ None,
move_missing,
move_many_update_delete,
move_many_update_add,
+ move_to_from_external,
]
if __name__ == '__main__':