Don't unconditionally put to be skipped paths in the skipped hash of the merge
handling as that affects the mergeinfo recording.

This fixes a merge_authz test failure.

* subversion/libsvn_client/merge.c
  (mark_dir_edited,
   mark_file_edited): When skipping, remember we skipped.

  (merge_file_opened,
   merge_dir_opened): Don't remember a skip on depth filtered roots
     directly.

* subversion/tests/cmdline/merge_authz_tests.py
  (mergeinfo_and_skipped_paths): Tweak expected notifications.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1441143 13f79535-47bb-0310-9956-ffa450edef68