Use the new sbox-ospath.py script to rewrite a ton of os.path.join() calls in this test script. 452 rewrites, to be exact.
Use the new sbox-ospath.py script to rewrite a ton of os.path.join()
calls in this test script. 452 rewrites, to be exact.

One rewrite was manually restored in create_deep_trees(), as SBOX is
not present in that function.

* subversion/tests/cmdline/merge_tests.py:
  (...): programmatic rewrites across most functions


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

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