Extend resolver regression test to illustrate broken behaviour when merging into copied directories which are part of an incoming move.
Extend resolver regression test to illustrate broken behaviour when
merging into copied directories which are part of an incoming move.

When merging an incoming dir move from trunk to branch, if children were added
on the trunk, these children trunk are present in the working copy but with
wrong URLs and they are missing from the resulting merge commit.

* subversion/tests/libsvn_client/conflicts-test.c
  (info_baton, info_func): New helper callback.
  (new_file_name_branch): New global.
  (create_wc_with_incoming_delete_dir_conflict): Create a file on the trunk,
   inside the directory which is about to be deleted/moved.
  (create_wc_with_incoming_delete_dir_conflict): Extend by adding dir/file on
   the trunk before moving dir -> dir2.
  (test_merge_incoming_move_dir3): Verify expected status of file added on
   trunk before dir was moved. Also, commit the merge result and ensure that
   both the file added on branch and the file added on trunk are present.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion