When running a log which writes tree conflicts, just queue up the pending conflicts and use the wc_db API, rather than messing with the tree conflict data directly and using the entry_modify() API.
When running a log which writes tree conflicts, just queue up the pending
conflicts and use the wc_db API, rather than messing with the tree conflict
data directly and using the entry_modify() API.

* subversion/libsvn_wc/log.c
  (log_runner): Remove the tree_conflicts_added member.
  (log_do_add_tree_conflict): Don't set the tree_conflict_added flag.
  (run_log): If tree conflicts are queued for processing, use the wc_db API
    to set them, rather than entry_modify().


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

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