[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r28816 - branches/reintegrate/subversion/tests/cmdline

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 9 Jan 2008 11:55:17 -0500

On Jan 9, 2008 2:51 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "David Glasser" <glasser_at_davidglasser.net> writes:
> > Wait, really? The target may have more changes, but they all are at
> > "the end". --reintegrate should choose the left-hand URL to be the
> > copy source of the branch, and successfully merge the (lack of)
> > changes from the branch to the target.
>
> Ah, right. But I'm planning to put some changes onto the branch.
> Would 'merge --reintegrate' then still succeed? That is, were we
> smart enough to have reintegrate look for a revision along the target
> line with respect to which the source is "up to date", and use that
> revision instead of HEAD?

Yes, this should work (now, even). The logic is essentially "is the
set of revisions merged to the branch a prefix of the revisions
committed to the target? if so, choose a left-hand-side equal to the
point where the prefix stops". See calculate_left_hand_side.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-09 17:55:28 CET

This is an archived mail posted to the Subversion Dev mailing list.