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

Re: svn commit: r23156 - in branches/sparse-directories/subversion: include libsvn_client

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-01-23 00:36:46 CET

On Mon, 22 Jan 2007, Karl Fogel wrote:

> On 1/22/07, Daniel Rall <dlr@collab.net> wrote:
> >In libsvn_client/diff.c:do_merge():
> >
> > 2145 /* Drive the reporter; do the diff. */
> > 2146 SVN_ERR(reporter->set_path(report_baton, "", drr.rev1,
> > 2147 /* ### TODO: dynamic depth here */
> > 2148 svn_depth_infinity,
> > 2149 FALSE, NULL,
> > 2150 pool));
> >
> >We have a DEPTH parameter passed in to do_merge(). Do we still not
> >want to pass it along to the reporter?
>
> The issue there (and possibly in some other spots) is that if the
> caller passes svn_depth_unknown, then we want to sniff the depth
> from the target working copy and use that. Some places in the
> code already do this, but not (yet) this one.

The commit message that I was responding to (r23156) introduces such
sniffing for the WC target of the merge through both code paths which
excercise do_merge(), svn_client_merge3() svn_client_merge_peg3():

http://svn.collab.net/viewvc/svn/branches/sparse-directories/subversion/libsvn_client/diff.c?pathrev=23156&r1=23155&r2=23156

  • application/pgp-signature attachment: stored
Received on Tue Jan 23 00:37:04 2007

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