For merge targets that are skipped because one of their ancestors is
obstructed, notify a shadowed update style notification.

I wish I had this output before I started doing this merge work, as
it makes the tree conflict tests much easier to understand.

* subversion/libsvn_client/merge.c
  (record_skip): Allow notifying more actions as skip.

  (merge_file_opened): Notify missing root as skipped when receiving changes.
    Always record the path as skipped.
  (merge_file_changed,
   merge_file_added,
   merge_file_deleted): Use specific skip type.

  (merge_dir_opened): Notify missing root as skipped when receiving changes.
    Always record the path as skipped.
  (merge_dir_changed,
   merge_dir_added,
   merge_dir_deleted): Use specific skip type.

  (merge_node_absent): Update caller.

* subversion/tests/cmdline/merge_reintegrate_tests.py
  (reintegrate_on_shallow_wc): Tweak expected result.

* subversion/tests/cmdline/merge_tests.py
  (merge_skips_obstructions,
   merge_to_sparse_directories): Tweak expected results.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (tree_conflicts_merge_edit_onto_missing,
   tree_conflicts_merge_del_onto_missing): Tweak expected results.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1441076 13f79535-47bb-0310-9956-ffa450edef68
Make the extra notification lines printed by 'svn merge --verbose' match the
style of the other notification lines that merge prints.

* subversion/svn/merge-cmd.c
  (automatic_merge, svn_cl__merge): Tweak messages.


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