[[[ On the merge-tracking branch: Fix repeat merge problem on working copy having subtree with the overlapping mergeinfo. * subversion/libsvn_client/diff.c (do_merge): Accepts 'subtrees_having_mergeinfo' hash whose keys are paths having 'svn:mergeinfo' property. Excludes the 'overlapping' sub path of current merge target by calling 'no op set-path' on it. (do_subtree_merges): New function (svn_client_merge3): (svn_client_merge_peg3): Creates empty 'subtrees_having_mergeinfo' and fills it with the help of 'do_subtree_merges'. Does subtree merges before doing the actual merge. Calls 'do_merge' with the new signatutre. * subversion/tests/cmdline/merge_tests.py (avoid_repeated_merge_on_subtree_with_merge_info): Fix inline comments. Fix expected_output for 'repeat merge case', we should get 'U copy_of_B/F/E/alpha'. Root of merge target 'copy_of_B' should have 'svn:mergeinfo' recorded. copy_of_B/F/E should have 'svn:mergeinfo' recorded. copy_of_B/F/E/alpha should be merged. (test_list): Expect 'avoid_repeated_merge_on_subtree_with_merge_info' to pass. Patch by: kameshj Suggested by: cmpilato dlr ]]]