* subversion/tests/cmdline/update_tests.py
  (break_moved_replaced_dir, test_list): New XFAIL test for resolving a local
   dir move tree conflict with --accept=theirs-conflict, where the move source
   has been locally replaced. This is another interesting case but probably
   not a 1.8 blocker, though it would be very nice to have.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1434668 13f79535-47bb-0310-9956-ffa450edef68