Fix expectations for issue #2618 test.
Fix expectations for issue #2618 test.

* subversion/tests/cmdline/update_tests.py
  (update_wc_with_replaced): Change expected outcome when an update pulls
  down a replacement on a locally replaced file.  This should be a
  tree conflict of the 'local delete, incoming edit upon update' variety
  since the incoming edit conflicts with the delete half of the replace.
  (test_list): Remove XFail from update_wc_with_replaced.

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