New merge test for case where a file child of the merge target will ultimately be deleted but still has eligible revisions to be merged first.
New merge test for case where a file child of the merge target will
ultimately be deleted but still has eligible revisions to be merged first.

The current issue #3067 related code for calculating the ranges to merge to
a subtree in the above case is flawed and can produce spurious tree
conflicts, see
http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc43.

* subversion/tests/cmdline/merge_tests.py
  (subtree gets changes even if ultimately deleted): New test.
  (test_list): Add subtree_gets_changes_even_if_ultimately_deleted,
  mark as XFail.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@873369 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion