On Thu, May 28, 2009 at 23:43, Hyrum K. Wright <hyrum_at_hyrumwright.org> wrote:
>...
> +++ trunk/subversion/libsvn_wc/translate.c Thu May 28 14:43:15 2009 (r37885)
>...
> @@ -300,16 +305,31 @@ svn_wc__get_keywords(apr_hash_t **keywor
> else
> list = force_list;
>
> - SVN_ERR(svn_wc__entry_versioned(&entry, path, adm_access, FALSE, pool));
> + SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, &repos_relpath,
> + &repos_root_url, NULL, &changed_rev,
> + &changed_date, &changed_author, NULL, NULL,
> + NULL, NULL, NULL, NULL, NULL, NULL,
> + NULL, NULL, NULL, NULL, NULL, NULL,
> + db, local_abspath, scratch_pool, scratch_pool));
> +
> + if (repos_root_url == NULL)
> + {
> + SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, &repos_relpath,
scan_addition, or scan_base_repos?
>...
> +++ trunk/subversion/libsvn_wc/update_editor.c Thu May 28 14:43:15 2009 (r37885)
>...
> @@ -4194,6 +4198,7 @@ merge_file(svn_wc_notify_state_t *conten
> svn_dirent_split(fb->path, &parent_dir, NULL, pool);
> SVN_ERR(svn_wc_adm_retrieve(&adm_access, eb->adm_access,
> parent_dir, pool));
> + db = svn_wc__adm_get_db(adm_access);
hm? How about eb->db ?
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2356620
Received on 2009-05-29 01:30:06 CEST