Re: Tree conflict: Add/Add on directory

Jon Foster <Jon.Foster_at_cabot.co.uk> writes:

> $ time svn1.7 upgrade
> Upgraded '.'
> [... snip more directories...]
> Upgraded 'some_other/path'
> subversion/svn/upgrade-cmd.c:81: (apr_err=200030)
> subversion/libsvn_client/cleanup.c:140: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1848: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1760: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1760: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1760: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1741: (apr_err=200030)
> subversion/libsvn_wc/upgrade.c:1502: (apr_err=200030)
> subversion/libsvn_wc/entries.c:2229: (apr_err=200030)
> subversion/libsvn_wc/entries.c:2166: (apr_err=200030)
> subversion/libsvn_wc/entries.c:2166: (apr_err=200030)
> subversion/libsvn_wc/entries.c:2099: (apr_err=200030)
> subversion/libsvn_wc/entries.c:1498: (apr_err=200030)
> subversion/libsvn_subr/sqlite.c:360: (apr_err=200030)
> svn: E200030: bind or column index out of range
> real 6m8.503s
> user 3m10.652s
> sys 2m0.640s
>
> This was the upgrade of my post-merge working copy, so it has local mods
> and that tree conflict. The working copy is 4.5GB (as reported by 'du
> -hs'). I'm using Debian stable, and I was using Debian's package of SVN
> 1.6.12. The working copy was originally checked out with 1.6.x, too.
>
> Is there anything relatively quick I can do to help debug this? Or can
> one of the WCNG developers see an obvious problem?

I think this will fix it:

svn diff subversion/libsvn_wc/entries.c
Index: subversion/libsvn_wc/entries.c
===================================================================
--- ../src/subversion/libsvn_wc/entries.c (revision 1130886)
+++ ../src/subversion/libsvn_wc/entries.c (working copy)
@@ -1495,7 +1495,7 @@
   /* ### column 10 is text_mod */
 
   if (actual_node->tree_conflict_data)
- SVN_ERR(svn_sqlite__bind_text(stmt, 11, actual_node->tree_conflict_data));
+ SVN_ERR(svn_sqlite__bind_text(stmt, 10, actual_node->tree_conflict_data));
 
   /* Execute and reset the insert clause. */
   return svn_error_return(svn_sqlite__insert(NULL, stmt));

It appears I broke it with r1089142, and that we don't have any
regression tests for this sort of upgrade :-(

-- 
Philip