On Thu, Apr 05, 2007 at 07:34:38PM +0530, Kamesh Jayachandran wrote:
> Hi All,
> In merge-cmd.c for rev_range_syntax style of merges we populate
> peg_revision with default values.
>
>
> This causes subversion/libsvn_client/merge.c:do_merge to make a
> redundant call to resolve the same via 'svn_client__repos_locations'.
>
> --- subversion/svn/merge-cmd.c (revision 24447)
> +++ subversion/svn/merge-cmd.c (working copy)
> @@ -77,11 +77,6 @@
> pool));
> sourcepath2 = sourcepath1;
>
> - /* Set the default peg revision if one was not specified. */
> - if (peg_revision.kind == svn_opt_revision_unspecified)
> - peg_revision.kind = svn_path_is_url(sourcepath1)
> - ? svn_opt_revision_head : svn_opt_revision_working;
> -
It would make more sense to fix libsvn_client to not do the redundant
resolution in the first place rather than work around the problem in the
'svn' binary.
Regards,
Malcolm
- application/pgp-signature attachment: stored
Received on Thu Apr 5 16:57:29 2007