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

Re: Problem with merge tracking in 1.5.0

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 18 Jul 2008 12:13:48 -0400

On Fri, Jul 18, 2008 at 12:07 PM, J J <eggsgloriouseggs_at_gmail.com> wrote:

>> It is fine to merge on sub-directories or files. What is not fine, is
>> to try to mix that with whole branch merges. The theory behind
>> reintegrate was that users were likely to do one or the other. The
>> big wrench stuck in the spokes of that idea was move/rename creating
>> this information.
> Making subtree merges and whole branches merges mutually exclusive is a
> pretty big assumption. Is that explicitly stated anywhere so users know
> what they're getting into? As far as releasing incremental merge tracking
> functionality it is definitely a step forward, but hopefully not the end
> goal.

I did not mean to imply they are mutually exclusive or intended to be
that way. It really gets back to this one problem of reflective
merges and the "solution" we put in place for 1.5. The reintegrate
option is a purely whole branch solution. But for example something
that works really well in 1.5 is to cherry pick a few files or
revisions to a branch and then later go back and merge everything to
that branch.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-18 18:14:15 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.