You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2014/05/28 16:46:50 UTC
svn commit: r1598028 -
/subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Author: danielsh
Date: Wed May 28 14:46:50 2014
New Revision: 1598028
URL: http://svn.apache.org/r1598028
Log:
* subversion/tests/cmdline/resolve_tests.py
(prop_conflict_resolution): Fix documentation to match code.
Modified:
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1598028&r1=1598027&r2=1598028&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Wed May 28 14:46:50 2014
@@ -156,7 +156,7 @@ def prop_conflict_resolution(sbox):
"""Revert the WC, update it to r2, and set the following properties:
- itoa : 'propname' = 'local_edit'
+ iota : 'propname' = 'local_edit'
'newprop' = 'new-val-no-incoming'
A/mu : 'propname' = 'local_edit'
A/D/gamma : 'propname' = 'incoming-no-conflict'
@@ -168,9 +168,9 @@ def prop_conflict_resolution(sbox):
Using svn propget, check that the resolution results in the following
properties:
- itoa : 'propname' = RESOLVED_EDITED_PROP_VAL_OUTPUT
+ iota : 'propname' = RESOLVED_DELETED_PROP_VAL_OUTPUT
'newprop' = 'new-val-no-incoming'
- A/mu : 'propname' = RESOLVED_DELETED_PROP_VAL_OUTPUT
+ A/mu : 'propname' = RESOLVED_EDITED_PROP_VAL_OUTPUT
A/D/gamma : 'propname' = 'incoming-no-conflict'
A/D/H/psi : 'newprop' = 'new-val-no-incoming'