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

Re: Subversion 1.5 issues blocking RC1

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 07 Apr 2008 10:58:16 -0400

C. Michael Pilato wrote:
> Mark Phippard wrote:
>> 2) Mergeinfo API.
>>
>> a) As Bert and Stefan have pointed out, the new API can be pretty
>> slow. The new API is good, they just have a valid case for leaving
>> the "old" API in place rather than remove it. I have to say we had a
>> few instances in the JavaHL tests where it the old API was more
>> appropriate. For example, sometimes you just want to check that there
>> is mergeinfo, you do not care so much about the details. The log
>> based approach is too heavy for this.
>
> I'm fine with re-adding a completely naive svn_client_get_mergeinfo()
> (so named for closer parity with the RA API), but I oppose re-adding the
> "eligible" version of this API.

On second thought, I'll keep the name as is because this function needs to
return a hash mapping full URLs to rangelists -- it's not technically
returning "mergeinfo".

>> b) Likely bug in the new API. It appears that the new API only works
>> when TARGET is a WC. The old API also supported a URL. We had to
>> change the JavaHL tests because of this. At the time, I thought this
>> was OK, but now realize it is probably a bug. If nothing else, the
>> error message has to be better.
>
> Doh!

Hrm. I can't seem to reproduce this at the command-line client level:

    ### URL SOURCE, URL TARGET
    $ svn mergeinfo http://svn.collab.net/repos/svn/trunk \
                 http://svn.collab.net/repos/svn/branches/1.5.x
    r29085
    r29091
    r29094
      ...
    r30378
    r30380
    r30392
    $ svn mergeinfo http://svn.collab.net/repos/svn/trunk \
                    http://svn.collab.net/repos/svn/branches/1.5.x \
                    --show-revs eligible
    r29083
    r29090
    r29092
      ...
    r30398
    r30401
    r30402

    ### WC SOURCE, URL TARGET
    $ svn mergeinfo . \
                    http://svn.collab.net/repos/svn/branches/1.5.x
    subversion/svn/main.c:1991: (apr_err=205000)
    svn: Try 'svn help' for more info
    subversion/svn/mergeinfo-cmd.c:80: (apr_err=205000)
    svn: Path '' is not a URL
    $ svn mergeinfo . \
                    http://svn.collab.net/repos/svn/branches/1.5.x \
                    --show-revs eligible
    subversion/svn/main.c:1991: (apr_err=205000)
    svn: Try 'svn help' for more info
    subversion/svn/mergeinfo-cmd.c:80: (apr_err=205000)
    svn: Path '' is not a URL

    ### URL SOURCE, WC TARGET
    $ svn mergeinfo http://svn.collab.net/repos/svn/trunk \
                    ../subversion-1.5.x
    r29085
    r29091
    r29094
      ...
    r30378
    r30380
    r30392
    $ svn mergeinfo http://svn.collab.net/repos/svn/trunk \
                    ../subversion-1.5.x \
                    --show-revs eligible
    r29083
    r29090
    r29092
      ...
    r30398
    r30401
    r30402

    ### WC SOURCE, WC TARGET
    $ svn mergeinfo . \
                    ../subversion-1.5.x
    subversion/svn/main.c:1991: (apr_err=205000)
    svn: Try 'svn help' for more info
    subversion/svn/mergeinfo-cmd.c:80: (apr_err=205000)
    svn: Path '' is not a URL
    $ svn mergeinfo . \
                    ../subversion-1.5.x \
                    --show-revs eligible
    subversion/svn/main.c:1991: (apr_err=205000)
    svn: Try 'svn help' for more info
    subversion/svn/mergeinfo-cmd.c:80: (apr_err=205000)
    svn: Path '' is not a URL
    $

Do the Java APIs pass unspecified peg revisions into the API or something?

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

Received on 2008-04-07 16:58:29 CEST

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.