Move checks for tree conflicts on files together in a single if block.
Move checks for tree conflicts on files together in a single if block.

* subversion/libsvn_wc/update_editor.c
  (add_file): Remove temporary variable.
  (open_file): Collapse a few if blocks. Slight functional change: this code
    now adds a path in to the deleted_trees hash even if it is a sub-path of
    an existing entry, but this makes no difference to the users of the hash.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion