* subversion/libsvn_client/merge.c   (tree_conflict_on_add): Do not ever try to add new tree conflicts     before removing existing ones. The old logic would try to do this     in some cases since it did not consider the "existing_conflict != NULL"     case in isolation. This might fix issue #3495, I can't verify this     myself since I cannot reproduce the issue.   (merge_file_added): If there are no obstructions or missing nodes,     but there is no node on disk, only add the new file if no tree     conflict has been flagged at this path yet. Otherwise, branch out     to tree_conflict_on_add().     If there are no obstructions or missing nodes, and a file is already     present on disk, flag a tree conflict as before, but do not consider     the existing file's schedule as an indicator for the tree conflict     reason. Rather, just flag the conflict with reason "added", based     on the assumption that an add must have happened in the history of     the branch.
* subversion/libsvn_client/merge.c
  (tree_conflict_on_add): Do not ever try to add new tree conflicts
    before removing existing ones. The old logic would try to do this
    in some cases since it did not consider the "existing_conflict != NULL"
    case in isolation. This might fix issue #3495, I can't verify this
    myself since I cannot reproduce the issue.
  (merge_file_added): If there are no obstructions or missing nodes,
    but there is no node on disk, only add the new file if no tree
    conflict has been flagged at this path yet. Otherwise, branch out
    to tree_conflict_on_add().
    If there are no obstructions or missing nodes, and a file is already
    present on disk, flag a tree conflict as before, but do not consider
    the existing file's schedule as an indicator for the tree conflict
    reason. Rather, just flag the conflict with reason "added", based
    on the assumption that an add must have happened in the history of
    the branch.


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

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion