You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/01/28 16:18:38 UTC
svn commit: r1439446 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: philip
Date: Mon Jan 28 15:18:38 2013
New Revision: 1439446
URL: http://svn.apache.org/viewvc?rev=1439446&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
(move_update_props): Extend to test move-update property conflicts.
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=1439446&r1=1439445&r2=1439446&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Jan 28 15:18:38 2013
@@ -6502,6 +6502,37 @@ def move_update_props(sbox):
'propertyB':'value3'})
svntest.actions.verify_disk(wc_dir, expected_disk, check_props = True)
+ # Further update and expect a conflict.
+ expected_status.tweak('A/B', status='D ', treeconflict='C', moved_to='A/B2')
+ expected_status.tweak(wc_rev=3)
+ expected_status.tweak( 'A/B2', 'A/B2/E', 'A/B2/E/beta', 'A/B2/E/alpha',
+ 'A/B2/F', 'A/B2/lambda', wc_rev='-')
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output,
+ expected_disk,
+ expected_status,
+ None, None, None,
+ None, None, 1,
+ '-r', '3', wc_dir)
+
+ # Resolve conflict moving changes and raising property conflicts
+ svntest.actions.run_and_verify_svn("resolve failed", None, [],
+ 'resolve',
+ '--accept=mine-conflict',
+ sbox.ospath('A/B'))
+
+ expected_status.tweak('A/B', treeconflict=None)
+ expected_status.tweak('A/B2/E', 'A/B2/E/beta', status=' C')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ expected_disk.tweak('A/B2', 'A/B2/E/alpha', props={'propertyA' : 'value1',
+ 'propertyB' : 'value2'})
+ expected_disk.tweak('A/B2/E', 'A/B2/E/beta', props={'propertyA' : 'value1',
+ 'propertyB' : 'value3'})
+ extra_files = ['dir_conflicts.prej', 'beta.prej']
+ svntest.actions.verify_disk(wc_dir, expected_disk, True,
+ svntest.tree.detect_conflict_files, extra_files)
+
#######################################################################
# Run the tests