[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: Daniel Rall <dlr_at_collab.net>
Date: 2007-12-01 01:10:33 CET

On Fri, 30 Nov 2007, Karl Fogel wrote:
...
> What we DO need is to agree on what *user-level* set of features are
> Must Ships. Personally, I think.
>
> 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.

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

  • application/pgp-signature attachment: stored
Received on Sat Dec 1 01:10:44 2007

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