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

Re: [PATCH] Fix XFail merge test 62

From: Senthil Kumaran S <senthil_at_collab.net>
Date: 2007-08-23 14:36:47 CEST

Hi Kamesh,

Kamesh Jayachandran wrote:
> 2)Pass that recursive adm_access to 'discover_and_merge_children' which
> inturn pass it to 'get_mergeinfo_paths' where you need to correctly
> respect the 'depth' functionality, Probably you can look at 'proplist
> --depth' code.

I had a look at the above code, and come up with some tweaks to my
previous patch (see patch attached). As per the proplist --depth code
only when we get the depth as 'infinity' and 'entry->kind' is
'svn_node_dir' we need to walk through the entire WC tree to get the
children. We can apply the similar logic here in 'get_mergeinfo_paths'
too, we need to crawl the WC dir only when we have the depth as infinity.

In the new patch I ve passed a recursive adm_access to
'discover_and_merge_children' and we handle the depth inside
'get_mergeinfo_paths'. I checked this patch, for all the depth cases and
it works fine.

Please, let me know if I am missing something here.

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
      (svn_client_merge_peg3): Initialize the administrative area lock to
       infinite depth.
      (svn_client_merge3): Initialize the administrative area lock to
       infinite depth.

    * 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

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

Received on Thu Aug 23 14:34:17 2007

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