[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r25885 - trunk/subversion/tests/cmdline
From:       kameshj () tigris ! org
Date:       2007-07-30 11:53:27
Message-ID: 200707301153.l6UBrR3w016272 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: kameshj
Date: Mon Jul 30 04:53:27 2007
New Revision: 25885

Log:
XFail Testcase to prove bug #2853

See http://subversion.tigris.org/issues/show_bug.cgi?id=2853

* subversion/tests/cmdline/merge_tests.py
  (single_file_replace_style_merge_capability): New function.
  (test_list): Add 'single_file_replace_style_merge_capability' to test_list
   with a XFail marker.

Patch by: Senthil Kumaran <senthil@collab.net>
Suggested by: kameshj


Modified:
   trunk/subversion/tests/cmdline/merge_tests.py

Modified: trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=25885&r1=25884&r2=25885
 ==============================================================================
--- trunk/subversion/tests/cmdline/merge_tests.py	(original)
+++ trunk/subversion/tests/cmdline/merge_tests.py	Mon Jul 30 04:53:27 2007
@@ -6956,6 +6956,40 @@
                                        expected_skip,
                                        check_props=1)
 
+def single_file_replace_style_merge_capability(sbox):
+  "replace-style merge capability for a single file"
+
+  ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2853. ##
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+  iota_path = os.path.join(wc_dir, 'iota')
+  mu_path = os.path.join(wc_dir, 'A', 'mu')
+
+  # delete mu and replace it with a copy of iota
+  svntest.main.run_svn(None, 'rm', mu_path)
+  svntest.main.run_svn(None, 'mv', iota_path, mu_path)
+
+  expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+  expected_status.tweak('A/mu', status='  ', wc_rev=2)
+  expected_status.remove('iota')
+  expected_output = svntest.wc.State(wc_dir, {
+    'iota': Item(verb='Deleting'),
+    'A/mu': Item(verb='Replacing'),
+    })
+  svntest.actions.run_and_verify_commit(wc_dir,
+                                        expected_output,
+                                        expected_status,
+                                        None, None, None, None, None,
+                                        wc_dir)
+
+  # Merge the file mu alone to rev1 
+  svntest.actions.run_and_verify_svn(None, [svntest.main.merge_notify_line(-2),
+                                            'D    ' + mu_path + '\n',
+                                            'A    ' + mu_path + '\n'],
+                                           [], 'merge', '-r2:1',
+                                           mu_path)
+
 
 ########################################################################
 # Run the tests
@@ -7022,6 +7056,7 @@
               Skip(mergeinfo_and_skipped_paths, svntest.main.is_ra_type_file),
               update_loses_mergeinfo,
               merge_loses_mergeinfo,
+              XFail(single_file_replace_style_merge_capability),
              ]
 
 if __name__ == '__main__':

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]