[PATCH] Fix issue #2829

Hi,

I am attaching a patch along with this email in order to fix issue #2829.

[[[
Fix for issue #2829

  ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2829. ##

    * subversion/libsvn_client/merge.c
      (determine_merges_performed): Logic added to handle mergeinfo
allocation
       for skipped path parent dir and their associated children.

    * subversion/tests/cmdline/merge_tests.py
      (merge_tree_deleted_in_target): Modified expectation.
      (merge_skips_obstructions): Modified expectation.
      (mergeinfo_and_skipped_paths): Modified expectation.
      (mergeinfo_recording_in_skipped_merge): Modified expectation.
      (test_list): Remove XFail mark from
'mergeinfo_recording_in_skipped_merge'

Patch by: Senthil Kumaran <senthil@collab.net>
Reviewed by: kameshj
]]]

Thank You.

--
Senthil Kumaran S

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