Use information from the conflict skels in the copy handling to avoid unneeded work with conflict descriptors which might include creating tempfiles.
Use information from the conflict skels in the copy handling to avoid unneeded
work with conflict descriptors which might include creating tempfiles.

* subversion/libsvn_wc/copy.c
  (includes): Add conflicts.h
  (copy_versioned_file): Read text conflict information from skel.
  (remove_node_conflict_markers): Just iterate the markers in the skel.


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

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