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

Re: svn commit: r30281 - in trunk/subversion: libsvn_ra_serf tests/cmdline

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Sat, 05 Apr 2008 15:08:24 -0400

Lieven Govaerts wrote:
> David Glasser wrote:
>> This test fails for me under RA-local, when my working copy is checked
>> out via HTTPS.
>> CMD: svn mergeinfo
>> file:///opt/svn/checkouts/in-memory-cache/subversion/tests/cmdline/svn-test-work/repositories/mergeinfo_tests-4/iota
>> --config-dir
>> /opt/svn/checkouts/in-memory-cache/subversion/tests/cmdline/svn-test-work/local_tmp/config
>> --password rayjandom --no-auth-cache --username jrandom <TIME =
>> 0.318293>
> ..
>> The problem here is that the URL you specified is being parsed as the
>> source URL (is that what you intended), and the target is being parsed
>> from the WC. I guess you should specify both?
> Yes, you're right. Fixed it in r30297.
> Now, there's one remaining question, and that's why 'svn mergeinfo
> --show-revs merged' on an unknown url doesn't always fail.
> If I take my working copy of Subversion trunk and run
> $ svn mergeinfo http://svn.collab.net/repos/svn/blabla .
> I get:
> subversion/libsvn_ra_serf/getlocationsegments.c:230: (apr_err=175007)
> svn: '/repos/svn/!svn/bc/30297/blabla' path not found
> But if I do the same thing in a small test repository I don't get any
> error at all:
> $ svnadmin create /tmp/repos
> $ svn co file:///tmp/repos /tmp/wc
> $ echo "blabla" > /tmp/wc/a
> $ svn add /tmp/wc/a
> $ svn ci -m "" /tmp/wc/a
> $ svn mergeinfo file:///tmp/repos/blabla /tmp/wc

'svn mergeinfo' works like this:

1. First, do the mergeinfo arithmetic to figure out the ranges and paths of
merged (or eligible, in that case) revisions.
2. Then, run 'svn log' (internally) over those paths/ranges.
3. The intersection of the log revisions and the mergeinfo revisions are
what gets through to the client.

Sometimes, 'svn mergeinfo' doesn't even need to talk to the server save for
the 'is-mergeinfo-capable' check; sometimes it only needs to talk to the
server to fetch the mergeinfo; sometimes it needs to get as far as the log

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

Received on 2008-04-05 21:08:41 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.