[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-11-30 19:42:14 CET

David Glasser wrote:
> On Nov 30, 2007 10:28 AM, Mark Phippard <markphip@gmail.com> wrote:
>> On Nov 30, 2007 1:25 PM, David Glasser <glasser@davidglasser.net> wrote:
>>> 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?
>> The issue shows the example. It is when you do a 2-URL merge:
>>
>> $ svn merge http://svn.collab.net/repos/svn/tags/1.4.5@27000 \
>> http://svn.collab.net/repos/svn/tags/1.4.4@26000 --dry-run
>> --- Merging r26346 through r26350 into '.':
>> C subversion/include/svn_version.h
>> C subversion/libsvn_wc/update_editor.c
>>
>
> So to clarify: 2-URL merge is svn_client_merge3 (and thus the one that
> we are considering making not use MT at all)?

Yes. svn_client_merge3() is two-URLs-and-peg-revs merge.
svn_client_merge_peg3() uses single source, peg-rev, and operative ranges.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Fri Nov 30 19:42:27 2007

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