subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1133600 - in /subversion/trunk/subversion/tests/cmdline: upgrade_tests.py upgrade_tests_data/add_add_del_del_tc.tar.bz2
Date Wed, 08 Jun 2011 23:34:15 GMT
Author: philip
Date: Wed Jun  8 23:34:15 2011
New Revision: 1133600

URL: http://svn.apache.org/viewvc?rev=1133600&view=rev
Log:
Add an XFAIL regression test for issue 3916, upgrade with tree conflicts.

* subversion/tests/cmdline/upgrade_tests.py
  (depth_exclude): Add missing status check.
  (add_add_del_del_tc): New test.
  (test_list): Add new test.

* subversion/tests/cmdline/upgrade_tests_data/add_add_del_del_tc.tar.bz2: New.

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_del_del_tc.tar.bz2
  (with props)
Modified:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1133600&r1=1133599&r2=1133600&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Jun  8 23:34:15 2011
@@ -965,6 +965,7 @@ def depth_exclude(sbox):
       'A'                 : Item(status='  ', wc_rev='1'),
       'X'                 : Item(status='A ', copied='+', wc_rev='-'),
     })
+  run_and_verify_status_no_server(sbox.wc_dir, expected_status)
 
 @Issue(3901)
 def depth_exclude_2(sbox):
@@ -981,6 +982,25 @@ def depth_exclude_2(sbox):
     })
   run_and_verify_status_no_server(sbox.wc_dir, expected_status)
 
+@Issue(3916)
+@XFail()
+def add_add_del_del_tc(sbox):
+  "wc with add-add and del-del tree conflicts"
+  
+  replace_sbox_with_tarfile(sbox, 'add_add_del_del_tc.tar.bz2')
+
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+  expected_status = svntest.wc.State(sbox.wc_dir,
+    {
+      ''     : Item(status='  ', wc_rev='4'),
+      'A'    : Item(status='  ', wc_rev='4'),
+      'A/B'  : Item(status='A ', treeconflict='C', copied='+', wc_rev='-'),
+      'X'    : Item(status='  ', wc_rev='3'),
+      'X/Y'  : Item(status='! ', treeconflict='C', wc_rev='-'),
+    })
+  run_and_verify_status_no_server(sbox.wc_dir, expected_status)
+
 ########################################################################
 # Run the tests
 
@@ -1025,6 +1045,7 @@ test_list = [ None,
               upgrade_from_format_28,
               depth_exclude,
               depth_exclude_2,
+              add_add_del_del_tc,
              ]
 
 

Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_del_del_tc.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_del_del_tc.tar.bz2?rev=1133600&view=auto
==============================================================================
Binary file - no diff available.

Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/add_add_del_del_tc.tar.bz2
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message