subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke1...@apache.org
Subject svn commit: r1758130 - /subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Date Sun, 28 Aug 2016 16:18:01 GMT
Author: luke1410
Date: Sun Aug 28 16:18:01 2016
New Revision: 1758130

URL: http://svn.apache.org/viewvc?rev=1758130&view=rev
Log:
Following up on r1758128, remove XFail marker after issue #4647 has been
fixed.

* subversion/tests/cmdline/resolve_tests.py
  (automatic_binary_conflict_resolution): Remove XFail marker.

Approved by: rhujiben

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=1758130&r1=1758129&r2=1758130&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Sun Aug 28 16:18:01 2016
@@ -601,7 +601,6 @@ def multi_range_merge_with_accept(sbox):
 #----------------------------------------------------------------------
 
 # Test for issue #4647 'auto resolution mine-full fails on binary file'
-@XFail()
 @Issue(4647)
 def automatic_binary_conflict_resolution(sbox):
   "resolve -R --accept [base | mf | tf] binary file"



Mime
View raw message