* subversion/libsvn_wc/update_editor.c (add_file):     Cosmetically rejigger auto-remove of tree conflicts against local     unversioned obstructions. Also possibly fix some future case where a node     has other conflicts beside a tree conflict (currently not possible AFAIK),     by checking for conflicts again after a tree conflict has been     automatically removed.
* subversion/libsvn_wc/update_editor.c (add_file):
    Cosmetically rejigger auto-remove of tree conflicts against local
    unversioned obstructions. Also possibly fix some future case where a node
    has other conflicts beside a tree conflict (currently not possible AFAIK),
    by checking for conflicts again after a tree conflict has been
    automatically removed.

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