Author: philip
Date: Mon Jan 28 13:28:45 2013
New Revision: 1439399
URL: http://svn.apache.org/viewvc?rev=1439399&view=rev
Log:
Add an XFail test for move-update with incoming property changes.
* subversion/tests/cmdline/update_tests.py
(move_update_props): New test.
(test_funcs): Add new test.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1439399&r1=1439398&r2=1439399&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Jan 28
13:28:45 2013
@@ -6427,6 +6427,81 @@ def update_swapped_depth_dirs(sbox):
None, None, None,
None, None, 1)
+@XFail()
+def move_update_props(sbox):
+ "move-update with property mods"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Commit some 'future' property changes
+ sbox.simple_propset('propertyA', 'value1',
+ 'A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
+ sbox.simple_commit()
+ sbox.simple_propset('propertyB', 'value2',
+ 'A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
+ sbox.simple_commit()
+ sbox.simple_update(revision=1)
+
+ # Make some local property changes
+ sbox.simple_propset('propertyB', 'value3',
+ 'A/B/E', 'A/B/E/beta')
+
+ sbox.simple_move("A/B", "A/B2")
+
+ # Update and expect a conflict
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A/B' : Item(status=' ', treeconflict='C'),
+ 'A/B/E' : Item(status=' ', treeconflict='U'),
+ 'A/B/E/alpha' : Item(status=' ', treeconflict='U'),
+ 'A/B/E/beta' : Item(status=' ', treeconflict='U'),
+ })
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/B/E/alpha', 'A/B/E/beta', 'A/B/E',
+ 'A/B/lambda', 'A/B/F', 'A/B')
+ expected_disk.add({
+ 'A/B2' : Item(),
+ 'A/B2/E' : Item(),
+ 'A/B2/E/alpha' : Item(contents="This is the file 'alpha'.\n"),
+ 'A/B2/E/beta' : Item(contents="This is the file 'beta'.\n"),
+ 'A/B2/F' : Item(),
+ 'A/B2/lambda' : Item(contents="This is the file 'lambda'.\n"),
+ })
+ expected_disk.tweak('A/B2/E', 'A/B2/E/beta', props={'propertyB':'value3'})
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status.tweak('A/B', status='D ', treeconflict='C', moved_to='A/B2')
+ expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta',
+ 'A/B/F', 'A/B/lambda', status='D ')
+ expected_status.add({
+ 'A/B2' : Item(status='A ', copied='+', wc_rev='-',
+ moved_from='A/B'),
+ 'A/B2/E' : Item(status=' M', copied='+', wc_rev='-'),
+ 'A/B2/E/beta' : Item(status=' M', copied='+', wc_rev='-'),
+ 'A/B2/E/alpha' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B2/F' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B2/lambda' : Item(status=' ', copied='+', wc_rev='-'),
+ })
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None, None,
+ None, None, 1,
+ '-r', '2', wc_dir)
+
+ # Resolve conflict moving changes to destination without conflict
+ svntest.actions.run_and_verify_svn("resolve failed", None, [],
+ 'resolve',
+ '--accept=mine-conflict',
+ sbox.ospath('A/B'))
+
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ expected_status.tweak('A/B', treeconflict=None)
+
+ expected_disk.tweak('A/B2', 'A/B2/E/alpha', props={'propertyA' : 'value1'})
+ expected_disk.tweak('A/B2/E', 'A/B2/E/beta', props={'propertyA' : 'value1',
+ 'propertyB':'value3'})
+ svntest.actions.verify_disk(wc_dir, expected_disk, check_props = True)
#######################################################################
# Run the tests
@@ -6509,6 +6584,7 @@ test_list = [ None,
update_removes_switched,
incomplete_overcomplete,
update_swapped_depth_dirs,
+ move_update_props,
]
if __name__ == '__main__':
