| Log Message: |
Factor out the checks for 'same repository' in the merge code. The only
functional change is to always return SVN_ERR_UNSUPPORTED_FEATURE for a
mis-match; previously we sometimes returned SVN_ERR_RA_UUID_MISMATCH.
* subversion/libsvn_client/merge.c
(url_uuid_t): New type, copied from relocate.c.
(is_same_repos, check_same_repos): New functions.
(merge_cousins_and_supplement_mergeinfo): Take repository roots as structs
rather than just URLs, and simplify by calling is_same_repos().
(merge_locked, merge_reintegrate_locked, merge_peg_locked): Use the new
type and functions.
|
subversion/trunk/subversion/libsvn_client/merge.c