[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: Blair Zajac <blair_at_orcaware.com>
Date: 2007-12-01 02:21:08 CET

Karl Fogel wrote:
> 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.

I am very much against deferring this back to 1.6. Merging back to the
branch-source is very important without having to figure out the revisions to merge.

What we'll find is people still relying upon svnmerge.py like tools to get the
job done.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 1 02:21:26 2007

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

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