subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1758201 - /subversion/trunk/subversion/tests/cmdline/resolve_tests.py
Date Mon, 29 Aug 2016 10:34:36 GMT
Author: rhuijben
Date: Mon Aug 29 10:34:35 2016
New Revision: 1758201

URL: http://svn.apache.org/viewvc?rev=1758201&view=rev
Log:
Following up on r1758155, add some explanations and move the final failing
test last.

* subversion/tests/cmdline/resolve_tests.py
  (automatic_binary_conflict_resolution): Tweak test comments. Move mine-full
    last. Wrap line to fit standard linelength.

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=1758201&r1=1758200&r2=1758201&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Mon Aug 29 10:34:35 2016
@@ -639,20 +639,16 @@ def automatic_binary_conflict_resolution
   def do_binary_conflicting_merge():
     svntest.actions.run_and_verify_svn(None, [],
                                        'revert', '--recursive', A_COPY_path)
-    svntest.main.run_svn(None, 'merge', sbox.repo_url + "/A/theta", wc_dir + "/A_COPY/theta")
+    svntest.main.run_svn(None, 'merge', sbox.repo_url + "/A/theta",
+                          wc_dir + "/A_COPY/theta")
 
   # Test 'svn resolve -R --accept base'
+  # Regression until r1758160
   do_binary_conflicting_merge()
   svntest.actions.run_and_verify_resolve([theta_branch_path],
                                          '-R', '--accept', 'base',
                                          A_COPY_path)
 
-  # Test 'svn resolve -R --accept mine-full'
-  do_binary_conflicting_merge()
-  svntest.actions.run_and_verify_resolve([theta_branch_path],
-                                         '-R', '--accept', 'mine-full',
-                                         A_COPY_path)
-
   # Test 'svn resolve -R --accept theirs-full'
   do_binary_conflicting_merge()
   svntest.actions.run_and_verify_resolve([theta_branch_path],
@@ -660,11 +656,19 @@ def automatic_binary_conflict_resolution
                                          A_COPY_path)
 
   # Test 'svn resolve -R --accept working'
+  # Equivalent to 'svn resolved'
   do_binary_conflicting_merge()
   svntest.actions.run_and_verify_resolve([theta_branch_path],
                                          '-R', '--accept', 'working',
                                          A_COPY_path)
 
+  # Test 'svn resolve -R --accept mine-full'
+  # There is no '.mine' for binary file conflicts. Same handling as 'working'
+  do_binary_conflicting_merge()
+  svntest.actions.run_and_verify_resolve([theta_branch_path],
+                                         '-R', '--accept', 'mine-full',
+                                         A_COPY_path)
+
 ########################################################################
 # Run the tests
 



Mime
View raw message