Don't modify the log accumulator when we find a tree conflict.  Instead, use the returned tree conflict to fill in the log accumulator in the caller.
Don't modify the log accumulator when we find a tree conflict.  Instead, use
the returned tree conflict to fill in the log accumulator in the caller.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Remove the log_accum parameter, and always set
    *pconflict.
  (do_entry_deletion, add_directory, open_directory, add_file, open_file):
    Loggily add the tree conflict if we detected one.


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

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