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

Re: [Issue 3618] suggest course of action after merge tree-conflicts due to missing subtrees

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 11 Jun 2011 14:00:00 +0300

Stefan Sperling wrote on Sat, Jun 11, 2011 at 09:21:57 +0200:
> On Sat, Jun 11, 2011 at 12:24:12AM +0300, Daniel Shahaf wrote:
> > pburba_at_tigris.org wrote on Thu, Jun 02, 2011 at 08:00:38 -0700:
> > > There's no easy way to determine the shallow structure of a working copy (beyond
> > > writing a script that parses the output of 'svn info -R').
> > >
> >
> > That would be useful script, I think :-)
> >
> > There is:
> > sqlite3 .svn/wc.db 'SELECT local_relpath, depth FROM nodes WHERE depth != '"'infinity'"
> > but it's not really something we can suggest (without wrapping it) to
> > people who don't know the db schema.
> Maybe we should add something like
> svn info --only-list-items-with-ambient-depth-lower-than-infinity
> Can't think of a better name right now...
> svn info --show-shallow-subtrees, maybe?

svn info --shallow

> This would suppress the usual output, and just list the relpaths of
> these nodes and their ambient depths.

So... how would you implement it? As a new changelist (implemented
under the hood as 'svn info --cl svn:shallow') or depth case (extending
svn_depth_t; not sure this can be done), or directly as an
svn_boolean_t only_shallow parameter to svn_client_info3()?

> See also http://subversion.tigris.org/issues/show_bug.cgi?id=3910
> which is about making 'svn status' show this information.
> If svn info had a better way to show this information we don't need
> status to do it.

svn status --shallow

Instead of showing the non-infinity depth value, simply including only
the non-infinity-depth'd items inthe output might suffice?

Note though that 'svn status --shallow --depth=empty' makes sense --- it
means "Don't recurse into those non-infinity-depth items that you're
about to show me" :-).
Received on 2011-06-11 13:00:40 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.