Re: [PATCH] Fix XFail merge test 62

Hi Kamesh,

Kamesh Jayachandran wrote:
> a)Change get_mergeinfo_paths to get only the desired level of depth
> entries (Remember you pass recursive adm_access now).
> b)Change discover_and_merge_children to do subtree(dir) merge only for
> 'depth=infinity'.
> c)Change discover_and_merge_children to remove the corresponding item
> from 'children_with_mergeinfo'.

With the above things, I ve come up with a new patch. Please have a look
at it and let me know if there is any changes.

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

    * subversion/libsvn_client/merge.c
      (get_mergeinfo_walk_baton): Add depth to mergeinfo walk baton.
      (get_mergeinfo_walk_cb): Make mergeinfo walk callback understand
       depth.
      (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.
       Do subtree(dir) merge only for 'depth=infinity' and remove the
       corresponding item from 'children_with_mergeinfo'.
      (svn_client_merge_peg3): Initialize the administrative area lock to
       infinite depth. Some formatting changes.
      (svn_client_merge3): Initialize the administrative area lock to
       infinite depth. Some formatting changes.

    * 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