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

On Jan 9, 2008 3:00 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> "David Glasser" <glasser_at_davidglasser.net> writes:
> > 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.
>
> Btw, the reason I wasn't straight in my head about this was that I'd
> still been thinking of --reintegrate as doing "swap in the branch tip
> to replace the trunk tip, because the branch contains everything the
> trunk does". That was the base case that originally motivated our
> --reintegrate thinking, but we've gotten well beyond that now, and as
> a result, what we do can no longer be described as a simple swap-in.
>
> I'm saying this here partly as a sanity check. If the above doesn't
> make sense to you, then I'm worried :-).

Yup. I think we basically decided that this extra case was both easy
to support and (as argued by Mark) pretty useful too.

--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