Extract the non-renaming part from reintegrate_with_rename as basic_reintegrate, which actually does pass.
Extract the non-renaming part from reintegrate_with_rename as
basic_reintegrate, which actually does pass.

* subversion/tests/cmdline/merge_tests.py
  (basic_reintegrate): New.
  (test_list): Adjust.

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