When in `--dry-run' mode of `svn merge' command, property conflicts made an interactive callback to the user to resolve the conflicts, unlike the text conflicts. Suppress the interactive callback in `--dry-run' mode.
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.

* subversion/libsvn_wc/props.c
  (svn_wc__merge_props): Pass `dry_run' parameter to the required
    methods.
  (apply_single_prop_add, apply_single_prop_delete,
   apply_single_prop_change, apply_single_generic_prop_change,
   apply_single_mergeinfo_prop_change): Pass `dry_run' to
    `maybe_generate_propconflict'
  (maybe_generate_propconflict): Check for `--dry-run' mode and set the
    boolean `conflict_remains', instead of invoking the interactive
    callback.

Patch by: Kannan R <kannanr@collab.net>


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

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