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

Re: Issue #3036 -- svn_client_merge3() and merge tracking

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-30 19:25:33 CET

On Nov 30, 2007 10:09 AM, C. Michael Pilato <cmpilato@collab.net> wrote:
> 1. Teach svn_client_merge3() to do real relatedness checks, and upon
> finding that the sources provided are in fact related, setup the merge in
> the same way that svn_client_merge_peg3() does. This guarantees that merge
> tracking will work in those scenarios. But it has some annoying UI
> consequences (see comments in issue #3036), and makes for a confusing API
> (sometimes you get merge tracking, sometimes you don't, and explaining when
> you do and don't could be a challenge to the uneducated).
> 2. We could simply say that svn_client_merge3() does not support merge
> tracking at all, and to get merge tracking, you must use
> svn_client_merge_peg3(). The entire world is simplified this way.

At the CLI level, what causes svn_client_merge3 vs svn_client_merge_peg3 to run?


David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 19:25:59 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.