You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Rall <dl...@collab.net> on 2007/01/22 21:21:55 UTC
Re: svn commit: r23156 - in branches/sparse-directories/subversion: include libsvn_client
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?
Re: svn commit: r23156 - in branches/sparse-directories/subversion: include libsvn_client
Posted by Karl Fogel <kf...@red-bean.com>.
On 1/22/07, Daniel Rall <dl...@collab.net> wrote:
> On Mon, 22 Jan 2007, Karl Fogel wrote:
>
> > On 1/22/07, Daniel Rall <dl...@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():
Thanks for the catch -- fixed in r23334.
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r23156 - in branches/sparse-directories/subversion: include libsvn_client
Posted by Daniel Rall <dl...@collab.net>.
On Mon, 22 Jan 2007, Karl Fogel wrote:
> On 1/22/07, Daniel Rall <dl...@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
Re: svn commit: r23156 - in branches/sparse-directories/subversion: include libsvn_client
Posted by Karl Fogel <kf...@red-bean.com>.
On 1/22/07, Daniel Rall <dl...@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.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org