Wrong log message?
On Thu, Jun 17, 2010 at 5:58 AM, <phi...@apache.org> wrote: > Author: philip > Date: Thu Jun 17 10:58:55 2010 > New Revision: 955551 > > URL: http://svn.apache.org/viewvc?rev=955551&view=rev > Log: > * subversion/libsvn_wc/adm_ops.c (svn_wc_add4): Remove unused variable. > > Modified: > subversion/trunk/subversion/libsvn_wc/wc_db.c > subversion/trunk/subversion/tests/cmdline/copy_tests.py > > Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=955551&r1=955550&r2=955551&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) > +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jun 17 10:58:55 2010 > @@ -526,6 +526,8 @@ navigate_to_parent(svn_wc__db_pdh_t **pa > { > const char *parent_abspath; > const char *local_relpath; > + svn_sqlite__stmt_t *stmt; > + svn_boolean_t got_row; > > if ((*parent_pdh = child_pdh->parent) != NULL > && (*parent_pdh)->wcroot != NULL) > @@ -541,6 +543,21 @@ navigate_to_parent(svn_wc__db_pdh_t **pa > scratch_pool, scratch_pool)); > VERIFY_USABLE_PDH(*parent_pdh); > > + /* Check that the parent has an entry for the child */ > + SVN_ERR(svn_sqlite__get_statement(&stmt, (*parent_pdh)->wcroot->sdb, > + STMT_SELECT_SUBDIR)); > + SVN_ERR(svn_sqlite__bindf(stmt, "is", (*parent_pdh)->wcroot->wc_id, > + svn_dirent_basename(child_pdh->local_abspath, > + NULL))); > + SVN_ERR(svn_sqlite__step(&got_row, stmt)); > + SVN_ERR(svn_sqlite__reset(stmt)); > + > + if (!got_row) > + return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, > + _("'%s' does not have a parent."), > + > svn_dirent_local_style(child_pdh->local_abspath, > + scratch_pool)); > + > child_pdh->parent = *parent_pdh; > > return SVN_NO_ERROR; > @@ -7081,8 +7098,6 @@ svn_wc__db_is_wcroot(svn_boolean_t *is_r > { > svn_wc__db_pdh_t *pdh; > const char *local_relpath; > - svn_sqlite__stmt_t *stmt; > - svn_boolean_t got_row; > > SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath)); > > @@ -7115,20 +7130,8 @@ svn_wc__db_is_wcroot(svn_boolean_t *is_r > > VERIFY_USABLE_PDH(pdh); > > - SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb, > - STMT_SELECT_SUBDIR)); > - > - SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, > - svn_dirent_basename(local_abspath, NULL))); > - > - SVN_ERR(svn_sqlite__step(&got_row, stmt)); > - SVN_ERR(svn_sqlite__reset(stmt)); > - > - if (got_row) > - { > - *is_root = FALSE; > - return SVN_NO_ERROR; > - } > + *is_root = FALSE; > + return SVN_NO_ERROR; > } > #endif > *is_root = TRUE; > > Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=955551&r1=955550&r2=955551&view=diff > ============================================================================== > --- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original) > +++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Thu Jun 17 > 10:58:55 2010 > @@ -4570,7 +4570,7 @@ test_list = [ None, > copy_make_parents_wc_repo, > copy_make_parents_repo_repo, > URI_encoded_repos_to_wc, > - allow_unversioned_parent_for_copy_src, > + XFail(allow_unversioned_parent_for_copy_src), > replaced_local_source_for_incoming_copy, > unneeded_parents, > double_parents_with_url, > > >
