Clarifications in code that detects pre-existing conflicts.
Clarifications in code that detects pre-existing conflicts.

* subversion/libsvn_wc/update_editor.c
  (open_directory): Move unrelated code out of the block that detects
    conflicts. Set the notification states to indicate whether it is a
    property conflict and/or a "content" conflict.
  (open_file): Clarify a comment and check that no inappropriate kind of
    conflict is found.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@873951 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,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion