commit 82e6e85d3c75e7780cd6811e39f3ed3a3adc5011
author David Samuel Glasser <glasser@apache.org> Wed Dec 12 01:47:15 2007 +0000
committer David Samuel Glasser <glasser@apache.org> Wed Dec 12 01:47:15 2007 +0000
tree c44c287468b85554b0cadae4a499d74c72b1b40b
parent b42b157c68d52579a63e0899f13ed8a0c3117ef1

On the whole-branch-merge branch:

Use the new "merge cousins and supplement mergeinfo" helper in
svn_client_merge_whole_branch.  Change the helper to just take one RA
session and reparent it.

* subversion/libsvn_client/merge.c
  (merge_cousins_and_supplement_mergeinfo): Use one RA session and
   reparent it.
  (svn_client_merge3): Adjust.
  (svn_client_merge_whole_branch): Adjust.  Get rid of merge_source
   and merge_sources locals.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/whole-branch-merge@868501 13f79535-47bb-0310-9956-ffa450edef68