[PATCH] Re: [Issue 480] New - 'svn up' breaks after anything added in WC [using ra_dav]

[Joe Orton <jo...@manyfish.co.uk>]

On Sun, Sep 02, 2001 at 07:26:05PM -0000, issues@subversion.tigris.org wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=480

I can see several ways to fix this, but I don't know which is right...

Should svn_wc_crawl_revisions be telling the reporter about things which
are new to the WC? I guess not; this is one way that works for me,
anyway.

Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/SVN/text-base/adm_crawler.c	Sun Sep  2 10:18:41 2001
+++ subversion/libsvn_wc/adm_crawler.c	Sun Sep  2 20:23:52 2001
@@ -1492,7 +1492,8 @@
           || (current_entry->existence == svn_wc_existence_deleted))
         SVN_ERR (reporter->delete_path (report_baton, full_entry_path));
 
-      else /* The entry exists on disk, and isn't `deleted'. */
+      else if (current_entry->schedule == svn_wc_schedule_normal)
+        /* The entry exists on disk, and isn't 'deleted'. */
         {
           if (current_entry->kind == svn_node_file) 
             {


...
> + 
> + $ svn co http://svn.collab.net/repos/svn
> + $ cd svn
> + $ touch foo
> + $ svn add foo
> + $ svn update
> + ? ./.svn_update.18380.00001.ra_dav
> + 
> + apr_error: #20014, src_err 0 : <Error string not specified yet>
> +   The REPORT status was 500, but expected 200.
> + 
> + ra_dav is picking up 'foo' at revision 0 and sending this REPORT body:
> + <S:entry rev="26"></S:entry>
> + <S:entry rev="0">foo</S:entry>
> + </S:update-report>
> + 
> + the "0" is causing the server to barf at some point.
> \ No newline at end of file
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: issues-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: issues-help@subversion.tigris.org
> 

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

Re: [PATCH] Re: [Issue 480] New - 'svn up' breaks after anything added in WC [using ra_dav]

[Ben Collins-Sussman <su...@collab.net>]

Joe Orton <jo...@manyfish.co.uk> writes:

> On Sun, Sep 02, 2001 at 07:26:05PM -0000, issues@subversion.tigris.org wrote:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=480
> 
> I can see several ways to fix this, but I don't know which is right...
> 
> Should svn_wc_crawl_revisions be telling the reporter about things which
> are new to the WC? I guess not; this is one way that works for me,
> anyway.

I think this is a fine solution.  We shouldn't report items that are
"scheduled for addition" during an update report.  If it turns out
that the update wants to add a file of the same name, then the
wc-editor will correctly die with an "obstructed update" error.

I'll commit this change, Joe... thanks.  I'm going to add a python
regression test too.



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