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

Re: merge tracking use cases

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-12-01 01:15:26 CET

Daniel Rall <dlr@collab.net> writes:
>> 1. 'svn merge' (with no further arguments) Does The Right Thing
>> whenever possible. At least it should DTRT on a feature branch,
>> and if we have to think imaginatively to figure out what it
>> should do (or how it should do it) under other circumstances,
>> then let's get thinking. There's another thread about this
>> going on, started by cmpilato, so please follow up there.
>
> Absolutely.
>
>> 2. Merging back to branch-source should choose the "right" set of
>> revisions to merge (this is issue #2897). But, it is *not*
>> necessary in 1.5 to avoid the user redoing conflict resolution
>> work. While that would be nice, it's okay to defer it to 1.6.
>
> Yes, this is what the plan has been for quite a while now.

I'm glad to hear you say this :-). But, others seem to think
differently, so it's important we hear from them too...

>> What else?
>
> The stuff listed in TODO-1.5-branch and the tracker with a 1.5
> milestone needs doing, but isn't all directly user-facing.

Sure -- that's not the level of detail I'm going for here, though.
What I'm talking about is shiftage of high-level goals that appears to
be going on in at least some minds, in the last day or two. (And if
that's not happening, then great!)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 1 01:15:39 2007

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