* subversion/tests/cmdline/tree_conflict_tests.py   (up_add_onto_add_revert): Update expected status to a replacement. The file     case of this XFail test is already fixed (and shows 'R'), but the directory     case is not.
* subversion/tests/cmdline/tree_conflict_tests.py
  (up_add_onto_add_revert): Update expected status to a replacement. The file
    case of this XFail test is already fixed (and shows 'R'), but the directory
    case is not.


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

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