Re: svn commit: r28315 - in trunk/subversion: libsvn_client tests/cmdline

On Dec 6, 2007 1:12 PM, <cmpilato@tigris.org> wrote:
> Author: cmpilato
> Date: Thu Dec 6 13:12:49 2007
> New Revision: 28315
>
> Log:
> Merge in full the work done on the 'mo-betta-two-url-merges' branch,
> including the portion done on the 'better-two-url-merges' branch on
> which it was based. This adds support for history-sensitive 3-way
> merges.

> + /* If we have a youngest common ancestor, we might be doing a pair of
> + merges. Given a requested merge of the differences between A and
> + B, and a common ancestor of C, we'll first merge the removal of
> + changes between C and A, then merge the addition of changes
> + between C and B. */

Is this comment now outdated?

> + if (yc_path && SVN_IS_VALID_REVNUM(yc_rev))
> + {
> + apr_array_header_t *ranges;
> + svn_opt_revision_range_t *range;
> + svn_opt_revision_t peg_revision;
> + peg_revision.kind = svn_opt_revision_number;
> +
> + /* Not that our merge sources are related. */

"Note".

Otherwise, I do concur that this change is mo-betta, as much as I can
be trusted in my current Novocaine-addled state...

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org