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/03/04 21:31:50 UTC
svn commit: r1452489 -
/subversion/trunk/subversion/tests/cmdline/move_tests.py
Author: philip
Date: Mon Mar 4 20:31:50 2013
New Revision: 1452489
URL: http://svn.apache.org/r1452489
Log:
* subversion/tests/cmdline/move_tests.py
(prop_test1): Correct initial propset, extend to test disk state
before and after revert.
Modified:
subversion/trunk/subversion/tests/cmdline/move_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1452489&r1=1452488&r2=1452489&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Mon Mar 4 20:31:50 2013
@@ -1030,12 +1030,12 @@ def deeper_move_file_test(sbox):
def prop_test1(sbox):
"test property merging on move-update"
- # pristine local incoming outcome
- # 1 p1 v2 p2 v2 p1 v2, p2 v2
- # 2 p1 v1 p1 v2 p2 v2 p1 v2, p2 v2
- # 3 p1 v1 p1 v2 p1 v2 p1 v2
- # 4 p1 v2 p1 v3 p1 v2 conflict
- # 5 p1 v1 p1 v2 p1 v3 p1 v2 conflict
+ # pristine local incoming outcome revert
+ # 1 p1 v2 p2 v2 p1 v2, p2 v2 p2 v2
+ # 2 p1 v1 p1 v2 p2 v2 p1 v2, p2 v2 p1 v1 p2 v2
+ # 3 p1 v1 p1 v2 p1 v2 p1 v2 p1 v2
+ # 4 p1 v2 p1 v3 p1 v2 conflict p1 v3
+ # 5 p1 v1 p1 v2 p1 v3 p1 v2 conflict p1 v3
sbox.build()
wc_dir = sbox.wc_dir
@@ -1052,7 +1052,7 @@ def prop_test1(sbox):
sbox.simple_add_text('content of f5', 'A/C/f5')
sbox.simple_propset('key1', 'value1',
'A/C/D2', 'A/C/D3', 'A/C/D5',
- 'A/C/f1', 'A/C/f2', 'A/C/f5')
+ 'A/C/f2', 'A/C/f3', 'A/C/f5')
sbox.simple_commit()
sbox.simple_propset('key2', 'value2',
'A/C/D1', 'A/C/D2',
@@ -1117,6 +1117,80 @@ def prop_test1(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/C')
+ expected_disk.add({
+ 'A/C2' : Item(),
+ 'A/C2/D1' : Item(props={'key1' : 'value2', 'key2' : 'value2'}),
+ 'A/C2/D2' : Item(props={'key1' : 'value2', 'key2' : 'value2'}),
+ 'A/C2/D3' : Item(props={'key1' : 'value2'}),
+ 'A/C2/D4' : Item(props={'key1' : 'value2'}),
+ 'A/C2/D5' : Item(props={'key1' : 'value2'}),
+ 'A/C2/f1' : Item(contents='content of f1',
+ props={'key1' : 'value2', 'key2' : 'value2'}),
+ 'A/C2/f2' : Item(contents='content of f2',
+ props={'key1' : 'value2', 'key2' : 'value2'}),
+ 'A/C2/f3' : Item(contents='content of f3',
+ props={'key1' : 'value2'}),
+ 'A/C2/f4' : Item(contents='content of f4',
+ props={'key1' : 'value2'}),
+ 'A/C2/f5' : Item(contents='content of f5',
+ props={'key1' : 'value2'}),
+ 'A/C2/D4/dir_conflicts.prej' : Item(contents=
+"""Trying to add new property 'key1'
+but the property already exists.
+<<<<<<< (local property value)
+value2=======
+value3>>>>>>> (incoming property value)
+"""),
+ 'A/C2/D5/dir_conflicts.prej' : Item(contents=
+"""Trying to change property 'key1'
+but the property has already been locally changed to a different value.
+<<<<<<< (local property value)
+value2=======
+value3>>>>>>> (incoming property value)
+"""),
+ 'A/C2/f4.prej' : Item(contents=
+"""Trying to add new property 'key1'
+but the property already exists.
+<<<<<<< (local property value)
+value2=======
+value3>>>>>>> (incoming property value)
+"""),
+ 'A/C2/f5.prej' : Item(contents=
+"""Trying to change property 'key1'
+but the property has already been locally changed to a different value.
+<<<<<<< (local property value)
+value2=======
+value3>>>>>>> (incoming property value)
+"""),
+ })
+
+ svntest.actions.verify_disk(wc_dir, expected_disk, True)
+
+ sbox.simple_revert('A/C2/D1', 'A/C2/D2', 'A/C2/D4', 'A/C2/D5',
+ 'A/C2/f1', 'A/C2/f2', 'A/C2/f4', 'A/C2/f5')
+
+ expected_status.tweak('A/C2/D1', 'A/C2/D2', 'A/C2/D4', 'A/C2/D5',
+ 'A/C2/f1', 'A/C2/f2', 'A/C2/f4', 'A/C2/f5',
+ status=' ')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ expected_disk.remove('A/C2/D4/dir_conflicts.prej',
+ 'A/C2/D5/dir_conflicts.prej',
+ 'A/C2/f4.prej',
+ 'A/C2/f5.prej')
+ expected_disk.tweak('A/C2/D1',
+ 'A/C2/f1',
+ props={'key2' : 'value2'})
+ expected_disk.tweak('A/C2/D2',
+ 'A/C2/f2',
+ props={'key1' : 'value1', 'key2' : 'value2'})
+ expected_disk.tweak('A/C2/D4', 'A/C2/D5',
+ 'A/C2/f4', 'A/C2/f5',
+ props={'key1' : 'value3'})
+ svntest.actions.verify_disk(wc_dir, expected_disk, True)
+
#######################################################################
# Run the tests