[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Fix XFail merge test 62

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-08-22 12:34:36 CEST

Hi,

I am attaching a patch which will fix XFail (merge_with_depth_files)
test 62 in merge_tests.py. This fix will ensure that when we use --depth
options such as empty, files, immediates and infinity along with 'svn
merge', then merge performs correctly.

[[[
Fix XFail merge test - merge with depth files

    * subversion/libsvn_client/merge.c
      (get_mergeinfo_paths): Add depth argument to the function and based
       on the depth argument value walk through the WC.
      (discover_and_merge_children): Pass depth argument to
       get_mergeinfo_paths.
      (svn_client_merge_peg3): Pass the depth argument directly to
       svn_wc_adm_probe_open3.
      (svn_client_merge3): Pass the depth argument directly to
       svn_wc_adm_probe_open3.

    * subversion/tests/cmdline/merge_tests.py
      (test_list): Remove XFail tag from 'merge_with_depth_files'
       in test_list.

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

Thank You.

--
Senthil Kumaran S
http://www.stylesen.org/


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

Received on Wed Aug 22 12:32:20 2007

This is an archived mail posted to the Subversion Dev mailing list.