 * subversion/tests/cmdline/update_tests.py    (update_moved_dir_leaf_del): Update this test to expect the current     behaviour of the trunk code. Instead of expecting an update to     automatically update a locally moved subtree, expect a tree conflict     to be flagged first, and expect 'svn resolve --accept=mine-conflict' to     automatically apply the update to the locally moved subtree.     Remove XFail marker, since this test is now passing.
 * subversion/tests/cmdline/update_tests.py
   (update_moved_dir_leaf_del): Update this test to expect the current
    behaviour of the trunk code. Instead of expecting an update to
    automatically update a locally moved subtree, expect a tree conflict
    to be flagged first, and expect 'svn resolve --accept=mine-conflict' to
    automatically apply the update to the locally moved subtree.
    Remove XFail marker, since this test is now passing.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion