Re: svn commit: r1135176 - /subversion/trunk/subversion/libsvn_client/merge.c

On Mon, Jun 13, 2011 at 05:01:17PM -0000, cmpilato_at_apache.org wrote:
> Author: cmpilato
> Date: Mon Jun 13 17:01:16 2011
> New Revision: 1135176
>
> @@ -10281,6 +10286,15 @@ calculate_left_hand_side(const char **ur
> _("'%s@%ld' must be ancestrally related to "
> "'%s@%ld'"), source_url, source_rev,
> target_url, target_rev);
> +
> + /* If the source revision is the same as the youngest common
> + revision, then there can't possibly be any unmerged revisions
> + that we need to apply to target. (Since it */

The above comment stops... prematurely.

Thanks for fixing this, Mike!

> + if (source_rev == yc_ancestor_rev)
> + {
> + svn_pool_destroy(iterpool);
> + return SVN_NO_ERROR;
> + }
>
> /* Get the mergeinfo from the source, including its descendants
> with differing explicit mergeinfo. */
Received on 2011-06-13 19:23:42 CEST