Thanks Senthil,
Committed with a small tweak at r25885.
<snip>
+ 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)
</snip>
Changed the above snip to
<snip>
+ 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)
</snip>
With regards
Kamesh Jayachandran
Senthil Kumaran S wrote:
> Hi,
>
> I am attaching a patch along with this mail which has an XFail test
> case (single_file_replace_style_merge_capability) added to
> merge_tests.py to illustrate bug #2853.
>
> Thank You.
>
> --
> Senthil Kumaran S
> http://www.stylesen.org/
> ------------------------------------------------------------------------
>
> Index: subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- subversion/tests/cmdline/merge_tests.py (revision 25884)
> +++ subversion/tests/cmdline/merge_tests.py (working copy)
> @@ -6956,7 +6956,41 @@
> 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__':
>
> ------------------------------------------------------------------------
>
> [[[
> 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
>
> Patch by: Senthil Kumaran <senthil@collab.net>
> kameshj
> ]]]
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 30 13:55:33 2007