Fix issue #1321: don't allow merge to add a file or directory whose copyfrom history has a different schema from the working copy.
Fix issue #1321: don't allow merge to add a file or directory whose
copyfrom history has a different schema from the working copy.

* subversion/libsvn_client/diff.c
  (check_schema_match): New function.
  (merge_file_added, merge_dir_added): Call it.

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