[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-08-30 16:09:37 CEST


In concept it looks fine though I have to test it yet.

I have a difficulty in replying to your mails with patch. I need to copy
the relevant snippets and painfully prepend '>'.

Here is my comment. You can move this below code just closer to your
'depth empty check'.
Why there exists a difference between depth_files and depth_immediates
in comparing the 'path_parent' and target.
I think it is not needed.

>+ /* If depth is files we need not recurse down the directory. */
>+ if ((wb->depth == svn_depth_files)
>+ && (strcmp(path_parent, target_parent) != 0))
>+ return SVN_NO_ERROR;
>+ /* If depth is immediates we need not recurse down each directory. */
>+ if ((wb->depth == svn_depth_immediates)
>+ && (strcmp(path_parent, wb->merge_target_path) != 0))
>+ return SVN_NO_ERROR;

Will tweak your patch with above comments and test three 'ra layers' and

Thanks for the patch.

With regards
Kamesh Jayachandran
Senthil Kumaran S wrote:
> 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
Received on Thu Aug 30 16:05:07 2007

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