Add missing conflict callback invocations for some tree conflicts during update.
Add missing conflict callback invocations for some tree conflicts during update.

Fixes a problem where some updates would flag a conflict but would not
invoke the interactive conflict resolver when the update is done.

Patch by: rhuijben
          me

* subversion/libsvn_wc/update_editor.c
  (mark_directory_edited, mark_file_edited, delete_entry, add_directory,
   add_file): Invoke the conflict callback just before notifying new tree
   conflicts.


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

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