Simplify some parameter passing in merge code.
Simplify some parameter passing in merge code.

This may cause a small change towards more consistent behaviour regarding
paths and peg revisions.  When find_reintegrate_merge() was given a WC path
for 'source_path_or_url', it first found the corresponding repo-relpath
('source_repo_rel_path') of the WC node, then looked up the WC node's URL at
the specified peg revision (which might thus resolve to a different URL),
and then used that resolved URL with the earlier repo-relpath.  The result
would presumably have been wrong if the path had been renamed between the
peg revision and the WC revision.  I haven't found a way to exercise this
case from the 'svn' command-line client.

* subversion/libsvn_client/merge.c
  (calculate_left_hand_side): Take a single 'source_loc' parameter instead
    of 'source_repos_rel_path', 'source_repos_root', and 'source_rev'.
  (find_reintegrate_merge): Manage the source location in a single
    'source_loc' variable instead of 'source_repos_root', 'source_url' and
    'source_repos_rel_path'.  Eliminate 'target_repos_rel_path'.

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