Following up on r1335108, skip the update on all conflict types (as that is what the update editor would anyway) and re-order a check to revert to reporting a skip instead of an error for tree conflicted nodes that don't have an existing BASE node for the anchor path.
Following up on r1335108, skip the update on all conflict types (as that is
what the update editor would anyway) and re-order a check to revert to
reporting a skip instead of an error for tree conflicted nodes that don't
have an existing BASE node for the anchor path.

* subversion/libsvn_client/update.c
  (update_internal): Apply change here.


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

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