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

Re: svn commit: r28567 - in branches/tree-conflicts/subversion: include libsvn_wc svn tests/cmdline

From: Stefan Sperling <stsp_at_elego.de>
Date: 2007-12-20 01:52:22 CET

On Thu, Dec 20, 2007 at 01:45:38AM +0100, Stefan Sperling wrote:
> On Wed, Dec 19, 2007 at 11:04:52PM +0100, Charles Acknin wrote:
> > On Dec 19, 2007 6:44 PM, <stsp@tigris.org> wrote:
> > > @@ -1426,6 +1428,12 @@
> > > err = svn_utf_cstring_to_utf8(&path_utf8, opt_arg, pool);
> > > opt_state.from_source = svn_path_canonicalize(path_utf8, pool);
> > > break;
> > > + case 't':
> > > + opt_state.show_tree_conflicts = TRUE;
> > > + /* '-t' implies '-v', otherwise svn_wc_client3() won't return
> > > + the entries we need. This hack isn't user-visible. */
> > > + opt_state.verbose = TRUE;
> > > + break;
> >
> > Shouldn't we let the user know that '-t' implies '-v'? Because in the
> > end, he's going to see the extra stuff that '-v' prints, right?
>
> A better solution may be to simply not make "-t" imply "-v"
> (which is wrong anyway from the UI perspective) and call
> svn_client_status3() like this instead:
>
> SVN_ERR(svn_client_status3(&repos_rev, target, rev,
> print_status, status_baton,
> opt_state->depth,
> get_all ----> (opt_state->verbose
> get_all continued ---> || opt_state->tree_conflicted),
> opt_state->update,
> opt_state->no_ignore,
> opt_state->ignore_externals,

Doh, this should have been opt_state->show_tree_conflicts.

But you get the idea...

-- 
Stefan Sperling <stsp@elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on Thu Dec 20 01:52:37 2007

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