[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: Karl Fogel <kfogel_at_red-bean.com>
Date: Wed, 09 Jan 2008 11:51:31 -0800

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

In general, there's some fuzziness around the question of which
reintegrations should succeed and which should fail. Feel free to
suggest tests; I'm happy to write them. I'm trying to come up with a
list of obvious tests right now.

> (Also, you need to merge-kluge here, right?)

No, actually I think all the Merge Kluge stuff is obsolete now -- the
issues that required it are long closed. When I get a chance I'd like
to take Merge Kluge out entirely and see if everything still works.

Thanks for the review!

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:51:41 CET

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