Re: [PATCH] Fix XFail merge test 62

Hi Kamesh,

Kamesh Jayachandran wrote:
> With this code how will you get the mergeinfo on files under a
> 'merge-target' of depth 'immedeates'?

With a simple change ie., passing a administrative area lock with depth
-1, I was able to solve the depth problem for 'svn merge'. It applies
for all the depth ie., empty, files, immediates, infinity.

In this case the depth is handled by the function
discover_and_merge_children. If it is a single file merge it is straight
forward and we need not care about the depth. In case of directory we
calculate the children with merge info from get_mergeinfo_paths and make
use of do_merge (for which we pass the depth) function inside
discover_and_merge_children which internally handles the depth
appropriately.

Reattaching the patch with the necessary changes.

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

    * subversion/libsvn_client/merge.c
      (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