svn commit: r1377044 - /subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py

[pb...@apache.org]

Author: pburba
Date: Fri Aug 24 18:49:56 2012
New Revision: 1377044

URL: http://svn.apache.org/viewvc?rev=1377044&view=rev
Log:
On the inheritable-props branch: The bump to WC format 30 includes some
work unrelated to this branch which fixes a failing test for issue #3707.

* subversion/tests/cmdline/resolve_tests.py:
  (prop_conflict_resolution): Remove XFail decorator and adjust comments
   re failure status.


Modified:
    subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py

Modified: subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py?rev=1377044&r1=1377043&r2=1377044&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/branches/inheritable-props/subversion/tests/cmdline/resolve_tests.py Fri Aug 24 18:49:56 2012
@@ -106,7 +106,6 @@ def automatic_conflict_resolution(sbox):
 # Test for issue #3707 'property conflicts not handled correctly by
 # svn resolve'.
 @Issue(3707)
-@XFail()
 def prop_conflict_resolution(sbox):
   "resolving prop conflicts"
 
@@ -225,8 +224,8 @@ def prop_conflict_resolution(sbox):
   #   2) 'A/mu' - An incoming prop edit on a local prop modification.
   #   3) 'A/D/gamma' - An local, non-conflicted prop edit
   #
-  # This currently fails because svn resolve --accept=[theirs-conflict |
-  # theirs-full] removes the conflicts, but doesn't install 'their' version
+  # Previously this failed because svn resolve --accept=[theirs-conflict |
+  # theirs-full] removed the conflicts, but didn't install 'their' version
   # of the conflicted properties.
   do_prop_conflicting_up_and_resolve('mine-full',
                                      ['local_edit\n'],