subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1758155 - /subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Date Sun, 28 Aug 2016 22:08:19 GMT
Author: rhuijben
Date: Sun Aug 28 22:08:19 2016
New Revision: 1758155

URL: http://svn.apache.org/viewvc?rev=1758155&view=rev
Log:
* subversion/tests/cmdline/resolve_tests.py
  (automatic_binary_conflict_resolution): Mark test XFail and extend test
    to show that my patch that I handed luke1410 is not good enough.

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=1758155&r1=1758154&r2=1758155&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Sun Aug 28 22:08:19 2016
@@ -602,6 +602,7 @@ def multi_range_merge_with_accept(sbox):
 
 # Test for issue #4647 'auto resolution mine-full fails on binary file'
 @Issue(4647)
+@XFail()
 def automatic_binary_conflict_resolution(sbox):
   "resolve -R --accept [base | mf | tf] binary file"
 
@@ -658,6 +659,11 @@ def automatic_binary_conflict_resolution
                                          '-R', '--accept', 'tf',
                                          A_COPY_path)
 
+  # Test 'svn resolve -R --accept working'
+  do_binary_conflicting_merge()
+  svntest.actions.run_and_verify_resolve([theta_branch_path],
+                                         '-R', '--accept', 'working',
+                                         A_COPY_path)
 
 ########################################################################
 # Run the tests



Mime
View raw message