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

Re: RFC: svn mergeinfo improvements for 1.5

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 01 Apr 2008 14:48:47 -0400

Paul Burba wrote:
> Here is my (probably futile) attempt to define what the bare minimum is:
> A) Revisions are displayed one per line (no ranges)


> B) Inoperative revisions are filtered out, but for merged and eligible
> revisions*


> C) Support only one TARGET path/URL


> D) Require --from-source.

Requiring an option (like --from-source) is weird. They're supposed to be
OPTIONal. :-) Should we drop --from-source, and make the usage syntax
similar to 'svn merge' itself?

   $ svn mergeinfo SOURCE [TARGET[@PEG-REV]]

> E) Show merged revisions by default. Add a new option --show-revs
> ['merged' | 'eligible'] allowing eligible to be shown instead.


> F) Make recursive by default, i.e. any subtrees of the TARGET with
> their own explicit mergeinfo are listed separately. This implies at
> least one level of indentation.

As I expressed in IRC, this adds some trickiness. We'll have to bifurcate
the logic so that URL TARGETs make use of the include_descendants=TRUE flag
to svn_ra_get_mergeinfo(), but working copy TARGETs will have to be crawled
in full with either per-item invocations of get_mergeinfo() (which is
awfully expensive, and grows in cost the deeper in the tree you get) or
custom inheritance-tracking logic. (This special-casing of WC TARGETs due
to needing honest answers in light of mixed revs, switched children, etc.)

So, defaulting to --depth=infinity today complicates the work of getting us
ready for 1.5.

On the flip side, adding --depth support in 1.6 means adding a level of
indentation (unless we go ahead and build that into 1.5), but also likely
means dealing with depths of dubious value (is 'svn mergeinfo --depth files'
likely to be terribly useful?). Maybe that's not a big deal ... the same
could probably be said about the depth support in many of our subcommands.

(We're close ... can you taste it?)

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

Received on 2008-04-01 21:21:19 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.