Rename basic_reintegrate to reintegrate_with_rename, since in fact it's not as basic as it looks.
Rename basic_reintegrate to reintegrate_with_rename, since in fact
it's not as basic as it looks.

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_rename): Rename from basic_reintegrate.
  (test_list): Adjust.

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