Re: Is this a bug in the incomplete=true handling?

Ben Collins-Sussman <sussman@collab.net> writes:

> You're in a situation where wc -does- contain the entry for foo, but
> foo is missing on disk. Our 'low confidence' report logic falls down
> here. You're right, Philip... one step ahead of me. If the entry
> exists in the parent, but is missing from disk, we need to *not* tell
> the server about it in a low-confidence report.
>
> But now I worry what will happen if the server then tries to resend
> the directory, but the entry for it already exists in the
> parent... will that break?

I think it will work, after all "rm -rf ./foo/ && svn up ." works when
incomplete=true is not set.

How about this:

Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 6827)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -306,10 +306,11 @@
              recreate it locally, so report as missing and move
              along. Again, don't bother if we're reporting
              everything, because the dir is already missing on the server. */
- if (missing && (! report_everything))
+ if (missing)
             {
- SVN_ERR (reporter->delete_path (report_baton, this_path,
- iterpool));
+ if (! report_everything)
+ SVN_ERR (reporter->delete_path (report_baton, this_path,
+ iterpool));
               continue;
             }

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org